Merge "Fix Dialog generating multiple onCancel()."