Merge "Fixing OCCancel with High_QOS in observe isn't deleting CB."