fix some TRDS leftovers
Cleanup theme assets when done with them

Before this patch if phone was left on long enough it would reboot
when a theme was applied due to files being left open.

Change-Id: I4c242249fcf6e8097789c3dd6690104296485784 (reverted from commit f1fc30f8c087036125d371323be1b5c46df0766d)