Bring GA custom vars closer to parity with legacy app tracking