[merge to m59]md settings: Fix dialog buttons on lock screen.

chrome/browser/resources/settings/people_page/setup_pin_dialog.html

 <link rel="import" href="chrome://resources/html/assert.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="../i18n_setup.html">
 <link rel="import" href="../icons.html">
 <link rel="import" href="lock_screen_constants.html">
 <link rel="import" href="pin_keyboard.html">
 <link rel="import" href="../settings_shared_css.html">
 
@@ skipping 32 matching lines @@
           <iron-icon icon="settings:warning"></iron-icon>
           <span class="middle">[[problemMessage_]]</span>
         </div>
 
         <!-- Pin keyboard -->
         <div id="pinKeyboardDiv" class="settings-box continuation">
           <pin-keyboard id="pinKeyboard" on-pin-change="onPinChange_"
               on-submit="onPinSubmit_" value="{{pinKeyboardValue_}}">
           </pin-keyboard>
         </div>
+      </div>
+      <div class="button-container">
+        <paper-button class="cancel-button" on-tap="onCancelTap_">
+          $i18n{cancel}
+        </paper-button>
 
-        <div class="button-strip">
-          <paper-button class="cancel-button" on-tap="onCancelTap_">
-            $i18n{cancel}
-          </paper-button>
-
-          <paper-button class="action-button" on-tap="onPinSubmit_"
-              disabled$="[[!enableSubmit_]]">
-            <span>[[getContinueMessage_(isConfirmStep_)]]</span>
-          </paper-button>
-        </div>
+        <paper-button class="action-button" on-tap="onPinSubmit_"
+            disabled$="[[!enableSubmit_]]">
+          <span>[[getContinueMessage_(isConfirmStep_)]]</span>
+        </paper-button>
       </div>
     </dialog>
   </template>
 
   <script src="setup_pin_dialog.js"></script>
 </dom-module>