Merge "Fix WM input limitations on secondary displays (1/N)"