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

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

Change-Id: I215425d36b6bf8822c91809e8ff7fbd635b5eb11