Merge "Only add one starting window for a task when unlock." into sc-dev