Merge "SF: Fix pacesetter promotion for folded mirroring" into 24D1-dev