Merge "Fix bypassing hooks in TextContentTest"