Merge "Update responsive grid spec cell size remainderSpace logic" into main