Merge "Add Settings.WallpaperSettingsActivity" into nyc-dev