Merge "Add more logging for debugging possible deadlock"