Merge "Add hysteresis to satellite icon when losing connection." into main