Merge "Refinement of default "Nearby devices" grants." into sc-dev