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