Merge "Fix lock screen wallpaper"