mc_pos_control: use target GPS time for prediction
navigator: recover from destructive merge