GRIM: Fix wrong Manny positioning when going from set ts to set tx
(cherry picked from commit db6e7bddfc7953af0e5cf06c17f0b4f1c7fdd8ee)