Merge pull request #6251 from mikeller/fix_disabling_gps_rescue_on_3d