Fix issues on clicking "x comments" link

Bug: 58005
Bug: 58372
Change-Id: Iba4162ca9d216950d212f7c1c4f250b23baa27cb
Merge "Fix issues on clicking "x comments" link"