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

* commit 'eb1f5349f8ac51e12e48497bbd2ae37badfe5009':
  Fix for b7155617 race condition in TextLayoutCache.cpp