Merge "Do not animate wallpaper when wakeAndUnlock" into qt-dev