Merge "Fix cursor event would be dropped" into sc-dev