Merge "Have CommentStore limit the maximum character length of comments"