Merge "Avoid calling rollback() in setVisibility() when nothing changed"