Merge "Refactor setInputWindows"