Merge "Refactor CommentBox for drafts and published comments"