Merge "Fix lock screen wallpaper" into qt-qpr1-dev am: d52eff6727

Change-Id: Iea22d8378b4743c182f5b9e14b6318741aeb9c3c