Merge "SF: Update cursor position using drawing state"