Merge "Update framework text layout to use Harfbuzz NG"