Merge "Do not animate wallpaper when wakeAndUnlock" into qt-dev
am: 39fc29c72a

Change-Id: I4b75bbb7f28c8f0e828395d490af8355e9a463c2