Merge "Resolve audio not routing to watch issue" into main