Merge "Add display lists caching."