Merge "Create WindowContext for adding the drag drop overlay" into sc-dev