Merge "Fix comment range parsing for file comments in notedb"