Merge "Clean-up change transition when cancelled before anim starts"