Merge "Do not use obsoleted snapshot as staring window" into sc-dev