Merge "Revert "Use location access for recent location apps."" into sc-dev