Merge "Calculate sizes for responsive grid" into udc-dev