Merge "Animate shade expansion when bouncer" into pi-dev
am: 6f99da88db

Change-Id: Ic4f5f6b6b4b4cb5a6175fb3f7e9d6ca9396eabdd