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

Change-Id: I61b667ef772b2ccc025e52e6767403a786c6a1bc