Merge "Turn down factory-default lock wallpaper support" into nyc-dev