Merge "Watchdog: break timeout loop via system fatal crash"