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

Change-Id: I71a12b7678cc47da4af5964434b5be0e4d9fd823