Merge "Use new ScopedCallback::newScopedIgnoreUserAbort helper function"