Merge "Do not show the satellite icon when wifi is connected" into main