Merge "Fix WindowContext is removed unexpectedly" into sc-dev