Merge "Fix transition timeout when launching activity in TaskFragment" into udc-dev