Merge "DisplayController refactoring for multiple displays" into main