Merge "Tone down poor connection avoidance" into jb-dev