Merge "Update the cursor visibility correctly after dismissing popup window" into sc-dev