Merge "Ensure that the cancel and end listener are called when cancelling state animation" into sc-dev