Merge "Add an unsuspend button option to SuspendDialogInfo"