Merge "Use getCurrentSizeRange to determine cell dimensions"