Merge changes I4cbf9376,Ief2111ec into sc-dev

* changes:
  Fix tap-through during screenshot dismissal
  Capture a new scrim for scrolling screenshots