Merge "Add drawable caching"