Merge "Add UT for updated remote connection service tracking." into main