Merge "Create a new drawable after caching the DrawableContainer" into oc-dev