Generate theme.xml after export theme hooks
Merge pull request #7356 from madeyourday/fix/export-theme-hook-xml