Merge changes from topic 'wallpaper_grey_scrim-oc-dr1-dev' into oc-dr1-dev

* changes:
  Fixed flaky test
  Disabled test
  Scrims should be grey when in-app