Merge "Support monitor input per display (2/2)"