Merge "Fix sizing of pattern view" into oc-mr1-dev am: adef5b23e0
am: 4f61cfb967

Change-Id: I84059c89eda774c833c710166a1778bd36c6ff98