Merge "Add @Nullable annotations to Task fields" into sc-v2-dev