Merge "Fix race when show error dialogs"