[automerger skipped] Merge "Do not animate wallpaper when wakeAndUnlock" into...
[automerger skipped] Merge "Do not animate wallpaper when wakeAndUnlock" into qt-dev am: 39fc29c7 -s ours
am: a77a040e -s ours
am skip reason: change_id I46574609a00712bdde5a4652ab5c9b0c04cbeeec with SHA1 bd6c92b0 is in history
Change-Id: I64737ade9b34230f1f61316549125d7dc3637205