Cleanup theme assets when done with them

Change-Id: I4c242249fcf6e8097789c3dd6690104296485784