Merge "Update ThemeHostTests"