Merge "Unify drawable caches"