Merge "Merge "Fix race condition in BoundsAnimationController" into pi-dev am: 2a7122cf9d am: 0c8f008da5"