Merge "Do not animate wallpaper when wakeAndUnlock" into qt-r1-dev
am: e8f8d71ea4

Change-Id: I224572b807b40e04deb1b709d346b054841c3678