Merge changes I09f58bdc,Iaf6cee33 into pi-dev

* changes:
  Hide SHOW_WHEN_LOCKED activity under scrim
  Temporarily show wallpaper when pulsing