Merge "Revert "Remove advanced button from location settings""