Merge "Move Profile Security Settings into Security Settings" into nyc-dev