am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev

* commit '96496e2d17607a8bfa944461c2458b0dcdeee872':
  Build fix after changing IWindowSession.