Merge "Fix crash in sensord that can occur during system instability"