Merge "Fix null pointer crash in BT renaming dialog"