Bug 967016: Detect v2 carts in a gear more accurately