Merge "Restore previous currentPage in applyLoadPlan in case task is re-ordered" into sc-dev