Merge "Do not animate wallpaper when wakeAndUnlock"