Merge "Additional permission for Device Presence UUID matching." into main