Merge "Fix WM input limitations on secondary displays (3/4)"