Merge "Fix getWallpaperSafeLocked" into main