Merge "Fix issue #79541100: [Blueline][PI][SPT]: Watchdog killing process and SIGSEGV" into pi-dev