Merge "Fix Settings activity typo." into nyc-dev