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