Merge "Let wallpaper get correct visibility and correct scrim color"