GDS-1166: Gravity subscriptions are not cleaned up on disconnect