Merge "Call showCurrentTask again if applyLoadPlan doesn't include running task" into main