Merge "Move LocationServicePreference to Location > LocationServices" into sc-dev