Merge "Rename minWidth/Height attributes" into nyc-dev