Merge "Fix getWallpaperInfo javadoc (again!)" into main