Merge "Remove portalToDisplayId from InputWindowHandle"