Merge "Fix preview for 2 pane small width (2/n)" into udc-dev