Merge "Preparations for different scrim depending on wallpaper" into nyc-mr1-dev