Merge "Use a SLEEP transition to trigger failsafe animation cancelling" into udc-dev