Merge "Fix NPE with live wallpaper" into qt-dev