am 217ca3b0: Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev

* commit '217ca3b0d310472e4df1aa4af72769d7c7a5becb':
  Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...