Merge "Try to recover when receiving unexpected transitionReady" into main