Merge "Optimize display lists"