Merge "Fix bug in recovering from HAL crash"