Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev