Merge "Mark #testStartAndFinishPositioning as flaky" into main