am 260290ab: (-s ours) am 6ed79d6e: am 9fb9a1c5: Merge "Fix a bug where window animation could be janky"

* commit '260290ab633c54d02a6cc32f1efb8087b4434013':