Merge "Made WallpaperControler.adjustWallpaperWindow more readable"