Merge "Update DeviceProfile to calculate responsive grid for folders" into udc-qpr-dev