Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE"