Merge "EventHub: Prevent duplicate descriptors" into android13-dev