Merge "Phone crash when old callback func is woken up when enabling BT."

    private void onDiscoverServicesResult(String deviceObjectPath, boolean result) {

        String address = mBluetoothService.getAddressFromObjectPath(deviceObjectPath);

        if (address == null) return;

        // We don't parse the xml here, instead just query Bluez for the properties.

        if (result) {

            mBluetoothService.updateRemoteDevicePropertiesCache(address);