Merge "Reload LockscreenWallpaper and ImageWallpaper on background thread" into nyc-dev