Merge "WallpaperManager clear API changes" into main