Merge "Fix wallpaper crop during unlock animation" into nyc-dev
am: d4a45e0c40

* commit 'd4a45e0c40b46e3d57617a91dbb0a9dc4412208c':
  Fix wallpaper crop during unlock animation

Change-Id: I862e208435365cd8c0639beab8e4eaee5fee8b45