Merge "Rework and clean up DisplayList projection"