Merge "Fix non tailcall onTransitionFinished" into udc-dev