BugId: 49393 - remove show all on comments
Merge branch 'bugid-49393-remove-show-all-on-comments' into dev