Merge pull request #11541 from ctzsnooze/Fix-GPS-Return-failsafe-with-bad-channel...