Merge "Move WindowContext module to window package" into sc-dev