Merge "SF: Fix UAF on pacesetter change during commit" into main