Merge "Show scrims when bouncer is on top of QS" into pi-dev