am e5b14ee1: Merge "Restore scrim views to former place in view hierarchy." into klp-dev

* commit 'e5b14ee1281325dc7e54df3fd820ff4bd830ef3c':
  Restore scrim views to former place in view hierarchy.