Merge "Enable show error dialogs on the secondary display"