Merge "Fix black image wallpaper issue" into qt-qpr1-dev am: 0f57fd1559

Change-Id: I01190df4e448e7125a0a5dc51822caa2b8757e08