Merge change 7124 into donut

* changes:
  Fixes #1977685. Prevent crash when the soft keyboard is brought up.