Merge "Made TaskViewTransitions less rigid" into udc-dev