Themes: Fix memory corruption from closing asset before XMLTree

Change-Id: Ifa411c18d46f4bb6befa18405ce7daa04de13ccc
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0