am 83cbc5a7: Merge "Stop consuming input on error dialogs." into lmp-mr1-dev

* commit '83cbc5a7588793435fd986e220fe1f9b88342069':
  Stop consuming input on error dialogs.