Merge "Reduce STHAL watchdog timeout to 3 seconds" into sc-dev