Merge "Check location permission for ConnDiags last." into sc-dev