Merge "Prevent set intent on non-leaf tasks" into sc-dev