Merge "Revert "Cache display lists for Drawables""