Merge "Make bubble channel setting 3 state with unset / on / off" into rvc-dev