Merge "Redirect AdvancedSecuritySettings to MoreSettings"