Merge "Refactor methods to access/modify BluetoothDevice alias and name"