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

Change-Id: I3a08a12217e09c4624683747cc1af0fb45ced711