Merge "Wait 10 seconds after APM is disabled before showing satellite icon" into main