Merge "Do not set wallpaper zoom on non-attached window"