Merge remote-tracking branch 'origin/MAGETWO-52009' into PR

Author: Volodymyr Zaets

app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml

@@ -74,7 +74,7 @@
                 </field>
                 <field name="theme">
                     <argument name="data" xsi:type="array">
-                        <item name="options" xsi:type="object">Magento\Framework\View\Design\Theme\Label</item>
+                        <item name="options" xsi:type="object">Magento\Theme\Model\Design\Theme\Label</item>
                         <item name="config" xsi:type="array">
                             <item name="formElement" xsi:type="string">select</item>
                             <item name="dataType" xsi:type="string">text</item>

app/code/Magento/Theme/Model/Design/Theme/Label.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Theme\Model\Design\Theme;
+
+class Label extends \Magento\Framework\View\Design\Theme\Label
+{
+    /**
+     * Return labels collection array
+     *
+     * @param bool|string $label add empty values to result with specific label
+     * @return array
+     */
+    public function getLabelsCollection($label = false)
+    {
+        $options = parent::getLabelsCollection();
+        if ($label) {
+            array_unshift($options, ['value' => 0, 'label' => $label]);
+        }
+        return $options;
+    }
+}

app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js

@@ -556,15 +556,6 @@ define([
                     this.setMaxPosition();
                 }
 
-                elems.forEach(function (record) {
-                    _.where(record.elems(),
-                        {
-                            formElement: 'select'
-                        }).forEach(function (elem) {
-                        elem.value(undefined);
-                    });
-                });
-
                 path = this.dataScope + '.' + this.index + '.' + (this.startIndex + idx);
                 this.source.set(path, rec);
             }, this);