Merge "Reset mTopRowIdSet in applyLoadPlan" into main