Merge "Untab Location Settings and tab Location Services" into sc-dev