Merge "Fix black image wallpaper issue" into qt-qpr1-dev