Merge "Revert "Adapt TextLayoutCache for new Harfbuzz scripts""