Merge "Remove snapshot starting window immediately if no defer request." into main