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

Change-Id: Ib9c4252cf57d59daded6f2c5cdec143ece1a28fb