Merge change 8931

* changes:
  fix [1985856] Seg fault when using the soft keyboard in the Messaging app