Merge changes Ia438f4a2,I356c2d57 into pi-dev

* changes:
  Bouncer notification and QS scrim
  Fix bouncer not showing on top of QS or notif