Merge "Fix USE_TEXT_LAYOUT_CACHE define"