Merge "Convert px to dp for determining minWidth and minHeight for each row count, and add breakpoints" into main