MD Settings: Restore focus after exiting various subpages.

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

 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/icon.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/html/util.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
@@ skipping 77 matching lines @@
         --settings-box-row-padding: 0;
       }
 
       .delete-profile-warning {
         /* In order to line up with the checkbox text. */
         -webkit-padding-start: 36px;
         padding-bottom: 10px;
         padding-top: 10px;
       }
     </style>
-    <settings-animated-pages id="pages" section="people">
+    <settings-animated-pages id="pages" section="people"
+        focus-config="[[focusConfig_]]">
       <neon-animatable route-path="default">
         <div id="picture-subpage-trigger" class="settings-box first two-line">
           <template is="dom-if" if="[[syncStatus]]">
             <div id="profile-icon" on-tap="onPictureTap_" actionable
                 style="background-image: [[getIconImageset_(profileIconUrl_)]]">
             </div>
 <if expr="not chromeos">
             <div class="middle two-line no-min-width"
                 on-tap="onProfileNameTap_" actionable>
 </if>
@@ skipping 97 matching lines @@
         <template is="dom-if" if="[[quickUnlockEnabled_]]">
           <div class="settings-box two-line" actionable
                on-tap="onConfigureLockTap_">
             <div class="start">
               $i18n{lockScreenTitle}
               <div class="secondary" id="lockScreenSecondary">
                 [[getPasswordState_(hasPin,
                                     prefs.settings.enable_screen_lock.value)]]
               </div>
             </div>
-            <button class="subpage-arrow" is="paper-icon-button-light"
-                aria-label="$i18n{lockScreenTitle}"
+            <button id="lockScreenSubpageTrigger" class="subpage-arrow"
+                is="paper-icon-button-light" aria-label="$i18n{lockScreenTitle}"
                 aria-describedby="lockScrenSecondary"></button>
           </div>
         </template>
 
         <template is="dom-if" if="[[easyUnlockAllowed_]]">
           <div id="easy-unlock" class="settings-box two-line">
             <div class="start">
               <div>$i18n{easyUnlockSectionTitle}</div>
               <div class="secondary">
                 <template is="dom-if" if="[[!easyUnlockEnabled_]]">
@@ skipping 170 matching lines @@
 <if expr="chromeos">
     <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]">
       <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"
           on-close="onEasyUnlockTurnOffDialogClose_">
       </easy-unlock-turn-off-dialog>
     </template>
 </if>
   </template>
   <script src="people_page.js"></script>
 </dom-module>