Merge "Stop consuming input on error dialogs." into lmp-mr1-dev