Merge "Make HiPri work when already connected."