Merge "Fix sizing of pattern view" into oc-mr1-dev