Merge "Add flag for removing SKIP_SCREENSHOT for mouse cursor" into main