Merge "Change the MIN_UPTIME back to 60s for checking satellite support" into main