Merge "Remove unused API on IWindowSession, prepare for multi-display."