Merge "Avoid race condition that gets PanService stuck in STATE_DISCONNECTED."