Merge "Add listener to the AVDC" into nyc-support-25.3-dev