Merge "Add metrics constant for new settings activity" into nyc-dev