Merge "Refactoring for bluetooth dialogs"