(BugId:95911) Fix new lines being added in certain scenarios in table cells.
Merge branch 'bugid-95911' into dev