Merge "Always compute zoom in adjustWallpaperWindows" into rvc-dev