Merge "Refactoring FolderPagedView to make it more testable" into main