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

Change-Id: I8f7c8a7aac845e842784e26585c8524102c8fc95