Merge "DisplayList overhaul"