Merge pull request #26904 from surajshetty3416/fix-list-view