[PDI-10744] - Updates for new UX flow.  Backed out saving user preferenc...

...e for warning dialogs