Merge "Waiting a proper time to remove the snapshot starting window" into sc-dev