Merge "WindowState: Correct wallpaper scaling" into sc-dev