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

Change-Id: I112a2adcb27444426c2fef8f5490f5cf4604c45c