Merge "Fix wallpaper crop during unlock animation" into nyc-dev am: d4a45e0c40
am: 863289d2cd
* commit '863289d2cd0243f133ccec750f8ac9bebab84bf1':
Change-Id: I77962256318c3eb0955e0a529c81d93ee1e6181f
This commit is contained in: