Minor cleanup
fix #4330: uploading waypoint is shown although not uploading
Merge branch 'issue-4330' into upstream