Merge "Fix tests for SecurityAdvancedSettings." into main