Merge "Fix LockscreenWallpaper jank" into nyc-mr1-dev am: 6912cf9b30
am: 75ff71de77

Change-Id: Ie81379189c19be45c5c1002c8ad3916bad20d56f