Merge "Add a user preference to opt in or out of a confirmation prompt for rollbacks."