Merge "Apply the avrcp volume when switching stream context" into main