Merge "Allow multiple input device in the same window" into main