Merge "Skip animation start logic if canceled"