Merge "Animate shade expansion when bouncer" into pi-dev