Merge "Bouncer animation" into pi-dev