Merge "Fix lockscreen wallpapers"