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

Change-Id: I76bd3a7e5e0e409cbc65b8ff42a362dc7cc15342