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

* commit '8843af290b1f1af869456f0eb2a599d066b5c14f':
  Fix wallpaper crop during unlock animation

Change-Id: I53559df05f7b8651d12196cbd4eb5bdd5923e953