Merge "Split Location and Security settings."