diff --git a/app-header-layout/app-header-layout.js b/app-header-layout/app-header-layout.js
index 23fc0bc8..2397e6a9 100644
--- a/app-header-layout/app-header-layout.js
+++ b/app-header-layout/app-header-layout.js
@@ -179,9 +179,10 @@ Polymer({
     // the content until the height of the header can be read.
     this.$.wrapper.classList.remove('initializing');
     // Update scroll target.
-    header.scrollTarget = this.hasScrollingRegion ?
-        this.$.contentContainer :
-        this.ownerDocument.documentElement;
+    header.scrollTarget =
+      header.scrollTarget !== header._defaultScrollTarget ? header.scrollTarget
+        : this.hasScrollingRegion ? this.$.contentContainer
+          : this.ownerDocument.documentElement;
     // Get header height here so that style reads are batched together before
     // style writes (i.e. getBoundingClientRect() below).
     var headerHeight = header.offsetHeight;
diff --git a/package-lock.json b/package-lock.json
index 86e65f09..70a8107f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -138,8 +138,7 @@
     "@polymer/font-roboto": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@polymer/font-roboto/-/font-roboto-3.0.1.tgz",
-      "integrity": "sha512-vNVKKaDBggg1lqJh3q8Yiylxe2UkQnxWd97/HpcalNyKdMtmqwINWd0FLggdlBVlPceZJc2egzdkmn5blvp89w==",
-      "dev": true
+      "integrity": "sha512-vNVKKaDBggg1lqJh3q8Yiylxe2UkQnxWd97/HpcalNyKdMtmqwINWd0FLggdlBVlPceZJc2egzdkmn5blvp89w=="
     },
     "@polymer/gen-typescript-declarations": {
       "version": "1.5.1",
@@ -171,7 +170,6 @@
       "version": "3.0.0-pre.26",
       "resolved": "https://registry.npmjs.org/@polymer/iron-a11y-keys-behavior/-/iron-a11y-keys-behavior-3.0.0-pre.26.tgz",
       "integrity": "sha512-mQoqG3ypK8VEhuydOtguAUiDs3oDiV4GwAuR9IoayCfX0ZcQqd7KS3iXcV/d4++Z6PmXq8l2jHjAzqlUQM01bA==",
-      "dev": true,
       "requires": {
         "@polymer/polymer": "^3.0.0"
       }
@@ -189,7 +187,6 @@
       "version": "3.0.0-pre.26",
       "resolved": "https://registry.npmjs.org/@polymer/iron-behaviors/-/iron-behaviors-3.0.0-pre.26.tgz",
       "integrity": "sha512-UCD3JfnIVVugAIahxiu+JqDeE3SMqgOoCumTC0yeSv03TKsXmRa5kacrButHRMYFSzHa8CJmtc7vyEf7IWGrww==",
-      "dev": true,
       "requires": {
         "@polymer/iron-a11y-keys-behavior": "^3.0.0-pre.25",
         "@polymer/polymer": "^3.0.0"
@@ -199,7 +196,6 @@
       "version": "3.0.0-pre.26",
       "resolved": "https://registry.npmjs.org/@polymer/iron-checked-element-behavior/-/iron-checked-element-behavior-3.0.0-pre.26.tgz",
       "integrity": "sha512-qvsNRLGnXiDNMG+ZZzVHbOTkHr72bYhsvZiGTf0RPwgbGbBOl201vVJaB0Ar1OnZAve3gSeVJXi9a8SrlOcxhA==",
-      "dev": true,
       "requires": {
         "@polymer/iron-form-element-behavior": "^3.0.0-pre.25",
         "@polymer/iron-validatable-behavior": "^3.0.0-pre.25",
@@ -218,7 +214,6 @@
       "version": "3.0.0-pre.26",
       "resolved": "https://registry.npmjs.org/@polymer/iron-form-element-behavior/-/iron-form-element-behavior-3.0.0-pre.26.tgz",
       "integrity": "sha512-yYTWD77Q6k0PjYWEbpvSs2wSEGbuW1B65ZfoKGrOSUoZvi+6Ai7z5bltkKFYEnsFEM54j37oNg8/y2xBuT9vJA==",
-      "dev": true,
       "requires": {
         "@polymer/polymer": "^3.0.0"
       }
@@ -291,7 +286,6 @@
       "version": "3.0.0-pre.26",
       "resolved": "https://registry.npmjs.org/@polymer/iron-meta/-/iron-meta-3.0.0-pre.26.tgz",
       "integrity": "sha512-uSwy+IkLeCsReXgWXp/AZTObhNC19HsJTW2gx2QjOGrNe3+TcpNWrTVlfwJxjSb8rg40leG47/NA7KpnCPmS2w==",
-      "dev": true,
       "requires": {
         "@polymer/polymer": "^3.0.0"
       }
@@ -355,7 +349,6 @@
       "version": "3.0.0-pre.26",
       "resolved": "https://registry.npmjs.org/@polymer/iron-validatable-behavior/-/iron-validatable-behavior-3.0.0-pre.26.tgz",
       "integrity": "sha512-vohuRrHbgzB7OCHYdNbR9nJ5vErOf9Cti+Vjst9AcF3cpsAaQVd8X4CZhcC5wjhrA2Jw6Lqy363GXlhc8oqDrw==",
-      "dev": true,
       "requires": {
         "@polymer/iron-meta": "^3.0.0-pre.25",
         "@polymer/polymer": "^3.0.0"
@@ -365,7 +358,6 @@
       "version": "3.0.0-pre.27",
       "resolved": "https://registry.npmjs.org/@polymer/paper-behaviors/-/paper-behaviors-3.0.0-pre.27.tgz",
       "integrity": "sha512-xylOPvJ+e0KXrJaUDd6beY/rya09zFRL1lrQN4hcKhBkmICwfUDojWtYJTjU8S7LU1Lpt24COQlWk9A7F5p+jw==",
-      "dev": true,
       "requires": {
         "@polymer/iron-behaviors": "^3.0.0-pre.25",
         "@polymer/iron-checked-element-behavior": "^3.0.0-pre.25",
@@ -373,6 +365,19 @@
         "@polymer/polymer": "^3.0.0"
       }
     },
+    "@polymer/paper-checkbox": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@polymer/paper-checkbox/-/paper-checkbox-3.1.0.tgz",
+      "integrity": "sha512-kXm6yDG1tT8if0XuJ2cc9NF+g8Ev4wG+rnf0a+Sx+O7J6fn1jcnBlYn72FlrfjVjDQZDBFmT6nynhD5PvFw8iQ==",
+      "requires": {
+        "@polymer/iron-a11y-keys-behavior": "^3.0.0-pre.26",
+        "@polymer/iron-checked-element-behavior": "^3.0.0-pre.26",
+        "@polymer/paper-behaviors": "^3.0.0-pre.27",
+        "@polymer/paper-ripple": "^3.0.0-pre.26",
+        "@polymer/paper-styles": "^3.0.0-pre.26",
+        "@polymer/polymer": "^3.0.0"
+      }
+    },
     "@polymer/paper-fab": {
       "version": "3.0.0-pre.26",
       "resolved": "https://registry.npmjs.org/@polymer/paper-fab/-/paper-fab-3.0.0-pre.26.tgz",
@@ -438,7 +443,6 @@
       "version": "3.0.0-pre.26",
       "resolved": "https://registry.npmjs.org/@polymer/paper-ripple/-/paper-ripple-3.0.0-pre.26.tgz",
       "integrity": "sha512-2/SipcW+UoRL28jUjhScbRFzS5O3BgBz7iezs08TFKQFisZf3nbm/9Lngl5J7Z5l7pAsrKycrd4W45HTvicQfg==",
-      "dev": true,
       "requires": {
         "@polymer/iron-a11y-keys-behavior": "^3.0.0-pre.25",
         "@polymer/polymer": "^3.0.0"
@@ -458,7 +462,6 @@
       "version": "3.0.0-pre.26",
       "resolved": "https://registry.npmjs.org/@polymer/paper-styles/-/paper-styles-3.0.0-pre.26.tgz",
       "integrity": "sha512-qUFOWA7dEO6Yk6d0PjMcDOjBnZo2iLoX7ScK1PLZsEkOO5Aj8oQhBLlvLN9qEzL8dibcV8PTg/JX2UCavFpg3A==",
-      "dev": true,
       "requires": {
         "@polymer/font-roboto": "^3.0.1",
         "@polymer/iron-flex-layout": "^3.0.0-pre.25",