Merge "Folder cell should match grid cell aspect ratio if isScalableGrid is true." into sc-dev