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

Change-Id: Ibc2c5b8a4e34eccbc0f76b51f984411c1b54bc97