Merge "Bouncer animation and message" into pi-dev am: be72f3d5b8
am: 7df2c87f0c

Change-Id: I437371b4d53bda1b078de6f76bf33a98bce37352