Merge "Revert "Check if cursor has moved out of viewport bounds in Curs..."" into main