Merge "Migrate theme host to CTSv2"