Merge "Handle MEDIA_ROUTING_CONTROL runtime revocation" into main