Merge "Create a new drawable after caching the DrawableContainer" into oc-dev am: 36d6a985cd
am: 246bf5cb9b

Change-Id: I0ef7196cdb87d40be15adff868ca4fcc17addd60