Merge "Revert "Make numFolderRows/numFolderColumns accept more values"" into main