Merge "Switches volume control to groupId based"