Merge "Use DeviceProfile numFolderRows and numFolderColumns" into main