Merge commit '49b6f05199ee8de5482d25b06268d952d03b9aba' * commit '49b6f05199ee8de5482d25b06268d952d03b9aba': Tweak so lock screen wallpaper is aligned with real wallpaper.