Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev