Merge "Make InputWindowInfo as a part of InputWindowHandle (1/2)"