Merge "Add user restriction to suppress error dialogs."