Merge "Refactor all uses of DisplayController singleton INSTANCE" into main