Use transitionInProgress instead of currentTrans != null

[#53626533]