Merge pull request #5929 from mikeller/fix_rc_modes_from_gps_rescue