Merge "Use correct category key for SecurityAdvancedSettings based on the type of active Security Settings"