Merge "Do not override MULTIPLE_TASK flag for singleInstancePerTask" into sc-dev