Merge "Fix obvious logic error with forceFinishCurrentTransition." into main