Merge "Improve logic for when we start ping threads." into jb-ub-mail-ur10