Merge "Remove SystemUIDialog inhertiance from BluetoothDialog" into main