Merge "Don't merge task view transitions in UnfoldTransitionHandler" into udc-dev