Merge "Always defer remove snapshot starting window if it contains IME" into main