Merge "Use actual lockscreen wallpaper" into nyc-dev