Merge "Generalize physical display management"