Fix for dialogManager closing active dialog when activate dialog is called on the same dialog twice

@bug W-2174464@
@rev jbuchanan@
Merging origin/dchasman/master-pending-W-2174464 into master