Merge "Use a separate lock object instead of mSpellCheckerMap"