Merge "Make DesktopWallpaperActivity aware of current user to support HSUM. (1/n)" into main