Merge "Use BluetoothController for status bar icon status" into mnc-dev