Merge "Fix missing DesktopWallpaperActivity in DW" into main