Merge "Relax getCurrentLocation() age constraints" into sc-dev