Merge "Refactor the avrcp update on bt contextual volume change" into main