Merge "Fix snippetizing cursor"