am 30d86e51: Merge change 7124 into donut

Merge commit '30d86e5143d01815763f8c28b0fc72b0493ea9f8'

* commit '30d86e5143d01815763f8c28b0fc72b0493ea9f8':
  Fixes #1977685. Prevent crash when the soft keyboard is brought up.