Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev