Merge "Move DisplayList to its own cpp file"