Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev