Merge "SF: remove the redundant variable on updateCursorAsync." into main