Merge "Using pixels instead of DPI for selecting the grid size" into main