Merge "Make error dialog in emergency dialog show up" into lmp-dev