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

Change-Id: Ib2244c7f448e7dafe0f6f87958e8677949de808f