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

Change-Id: I613390d669276ca5ac68b72764ac6ffb5f0002ba