Merge "Fix issue #9586838: Crash after waking up Hammerhead device"