Merge "Make volume UI work when using eARC." into main