Merge main.

diff --cc source/watchdog.py
index b8b7483,9622496..71f8aaa
--- 1/source/watchdog.py
--- 2/source/watchdog.py
+++ b/source/watchdog.py
@@@ -108,11 -102,9 +108,11 @@@ def _recoverAttempt()
                oledll.ole32.CoCancelCall(_coreThreadID,0)\r
        except:\r
                pass\r
 +      import NVDAHelper\r
 +      NVDAHelper.localLib.cancelSendMessage()\r
  \r
  @ctypes.WINFUNCTYPE(ctypes.wintypes.LONG, ctypes.c_void_p)\r
- def crashHandler(exceptionInfo):\r
+ def _crashHandler(exceptionInfo):\r
        # An exception might have been set for this thread.\r
        # Clear it so that it doesn't get raised in this function.\r
        ctypes.pythonapi.PyThreadState_SetAsyncExc(threading.currentThread().ident, None)\r