Merge "Fix bug where GATT descriptors weren't being added to right characteristic"