Merge "Add constant to link to app's general settings" into nyc-dev