Making move_base care for orientation when next action is not move_base and Fixing bug when PREEMPTED