Merge "Refactor to use a DisplayModel to host common per display objects" into main