Merge "Fix NPE on TaskFragment" into udc-dev