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