Merge "Always choose starting window's sync transaction to reparent." into main