[automerger skipped] Merge "Do not animate wallpaper when wakeAndUnlock" into qt-dev
am: 39fc29c72a -s ours
am skip reason: change_id I46574609a00712bdde5a4652ab5c9b0c04cbeeec with SHA1 bd6c92b074 is in history

Change-Id: Ibad934b261ea64ccbe85c9e4eca6a77ec5e5cc60