Merge "Resolve referencing for preferred audio routing" into main