Merge "Input devices configure on per-display basis (1/2)"