Merge "Modify TaskSnapshotWindow#scheduleRemove" into sc-qpr1-dev