Merge "Do not schedule animation if control doesn't change"