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