Merge "Code refactor. Move null check into detachWallpaperLocked in WPMS." into main