Fix lock deadlocks, production NPE, connection leaks, and log typo#539

kasnder wants to merge 1 commit intomasterTrackerControl/tracker-control-android:masterfrom

claude/code-review-xZGDxTrackerControl/tracker-control-android:claude/code-review-xZGDxCopy head branch name to clipboard