Merge "Whitelist security settings activity v2 for secondary users"