Merge change 22030 into eclair

* changes:
  Potential fix for NPE at startExtractingText.