Merge "Fix race condition in BoundsAnimationController"