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

Change-Id: Ia1517e22b8319e1982edc84918f3029643913920