Merge changes I15075455,I03f322e8 into main

* changes:
  Additional broadcast config logic for LEA multi-codec
  Additional context matching logic for LEA multi-codec