sTGCSimHit and MMSimHit had been applied to 21.3. Create this merge request for master. Manual sweep of !22581 (merged).