Merge "Bouncer animation" into pi-dev am: 560b26a9d2
am: 266226b3d5

Change-Id: Ic8303e6ddfa78190648c75e1319042f0e7d7f7e5