Merge "Avoid null connected devices when updating routing information" into main