Merge "Introduce WindowContextController" into sc-dev