Merge "Do not show Bluetooth icon when headset is not active"