Merge "DisplayList optimizations and fixes."