[automerger skipped] Merge "Fix lock screen wallpaper" into qt-qpr1-dev am:...
[automerger skipped] Merge "Fix lock screen wallpaper" into qt-qpr1-dev am: d52eff67 am: 2f836303 -s ours
am skip reason: Change-Id I4c5151ad6b40d0f0996fdbb825745729cc003425 with SHA-1 7296c936 is in history
Change-Id: I94eb0b723577299663b29ae3953e5a4ba5d000e5