Merge "Fix in transition canceling logic"