Merge "Bidi-isolate the comment in history pages"