Merge "Add feature flag and attribute for responsive grid" into udc-dev