Merge "Fix LockscreenWallpaper jank" into nyc-mr1-dev