Merge "Bouncer animation and message" into pi-dev