diff --git a/.gitignore b/.gitignore
index 959052720949..6fa790f0b1b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 TAGS
 tags
 ID
+!/browser/extensions/activity-stream/prerendered/id/
 !/browser/extensions/screenshots/webextension/_locales/id/
 .DS_Store*
 *.pdb
diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
index 06479a349647..1ee43217f465 100644
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -25,6 +25,8 @@ var gExceptionPaths = [
 
   // https://github.com/mozilla/activity-stream/issues/3053
   "resource://activity-stream/data/content/tippytop/images/",
+  // https://github.com/mozilla/activity-stream/issues/3758
+  "resource://activity-stream/prerendered/",
 
   // browser/extensions/pdfjs/content/build/pdf.js#1999
   "resource://pdf.js/web/images/",
diff --git a/browser/components/newtab/aboutNewTabService.js b/browser/components/newtab/aboutNewTabService.js
index d886daf29928..8e616a9b991a 100644
--- a/browser/components/newtab/aboutNewTabService.js
+++ b/browser/components/newtab/aboutNewTabService.js
@@ -16,14 +16,12 @@ XPCOMUtils.defineLazyModuleGetter(this, "AboutNewTab",
                                   "resource:///modules/AboutNewTab.jsm");
 
 const LOCAL_NEWTAB_URL = "chrome://browser/content/newtab/newTab.xhtml";
+const TOPIC_APP_QUIT = "quit-application-granted";
+const TOPIC_LOCALES_CHANGE = "intl:requested-locales-changed";
 
-// Debug versions are only available in Nightly
-const ACTIVITY_STREAM_URLS = {
-  "": "resource://activity-stream/data/content/activity-stream.html",
-  "debug": "resource://activity-stream/data/content/activity-stream-debug.html",
-  "prerender": "resource://activity-stream/data/content/activity-stream-prerendered.html",
-  "prerenderdebug": "resource://activity-stream/data/content/activity-stream-prerendered-debug.html",
-};
+// Automated tests ensure packaged locales are in this list. Copied output of:
+// https://github.com/mozilla/activity-stream/blob/master/bin/render-activity-stream-html.js
+const ACTIVITY_STREAM_LOCALES = new Set("en-US ach ar ast az be bg bn-BD bn-IN br bs ca cak cs cy da de dsb el en-GB eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gu-IN he hi-IN hr hsb hu hy-AM ia id it ja ka kab kk km kn ko lij lo lt lv mk ml mr ms my nb-NO ne-NP nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru sk sl sq sr sv-SE ta te th tl tr uk ur uz vi zh-CN zh-TW".split(" "));
 
 const ABOUT_URL = "about:newtab";
 
@@ -38,7 +36,8 @@ const PREF_ACTIVITY_STREAM_DEBUG = "browser.newtabpage.activity-stream.debug";
 
 
 function AboutNewTabService() {
-  Services.obs.addObserver(this, "quit-application-granted");
+  Services.obs.addObserver(this, TOPIC_APP_QUIT);
+  Services.obs.addObserver(this, TOPIC_LOCALES_CHANGE);
   Services.prefs.addObserver(PREF_ACTIVITY_STREAM_ENABLED, this);
   Services.prefs.addObserver(PREF_ACTIVITY_STREAM_PRERENDER_ENABLED, this);
   if (!IS_RELEASE_OR_BETA) {
@@ -93,6 +92,7 @@ AboutNewTabService.prototype = {
   _newTabURL: ABOUT_URL,
   _activityStreamEnabled: false,
   _activityStreamPrerender: false,
+  _activityStreamPath: "",
   _activityStreamDebug: false,
   _overridden: false,
 
@@ -110,25 +110,34 @@ AboutNewTabService.prototype = {
       case "nsPref:changed":
         if (data === PREF_ACTIVITY_STREAM_ENABLED) {
           if (this.toggleActivityStream()) {
-            Services.obs.notifyObservers(null, "newtab-url-changed", ABOUT_URL);
+            this.notifyChange();
           }
         } else if (data === PREF_ACTIVITY_STREAM_PRERENDER_ENABLED) {
           this._activityStreamPrerender = Services.prefs.getBoolPref(PREF_ACTIVITY_STREAM_PRERENDER_ENABLED);
-          Services.obs.notifyObservers(null, "newtab-url-changed", ABOUT_URL);
+          this.notifyChange();
         } else if (!IS_RELEASE_OR_BETA && data === PREF_ACTIVITY_STREAM_DEBUG) {
           this._activityStreamDebug = Services.prefs.getBoolPref(PREF_ACTIVITY_STREAM_DEBUG, false);
-          Services.obs.notifyObservers(null, "newtab-url-changed", ABOUT_URL);
+          this.updatePrerenderedPath();
+          this.notifyChange();
         }
         break;
-      case "quit-application-granted":
+      case TOPIC_APP_QUIT:
         this.uninit();
         if (IS_MAIN_PROCESS) {
           AboutNewTab.uninit();
         }
         break;
+      case TOPIC_LOCALES_CHANGE:
+        this.updatePrerenderedPath();
+        this.notifyChange();
+        break;
     }
   },
 
+  notifyChange() {
+    Services.obs.notifyObservers(null, "newtab-url-changed", this._newTabURL);
+  },
+
   /**
    * React to changes to the activity stream pref.
    *
@@ -159,10 +168,38 @@ AboutNewTabService.prototype = {
     if (!IS_RELEASE_OR_BETA) {
       this._activityStreamDebug = Services.prefs.getBoolPref(PREF_ACTIVITY_STREAM_DEBUG, false);
     }
+    this.updatePrerenderedPath();
     this._newtabURL = ABOUT_URL;
     return true;
   },
 
+  /**
+   * Figure out what path under prerendered to use based on current state.
+   */
+  updatePrerenderedPath() {
+    // Debug files are specially packaged in a non-localized directory
+    let path;
+    if (this._activityStreamDebug) {
+      path = "static";
+    } else {
+      // Use the exact match locale if it's packaged
+      const locale = Services.locale.getRequestedLocale();
+      if (ACTIVITY_STREAM_LOCALES.has(locale)) {
+        path = locale;
+      } else {
+        // Fall back to a shared-language packaged locale
+        const language = locale.split("-")[0];
+        if (ACTIVITY_STREAM_LOCALES.has(language)) {
+          path = language;
+        } else {
+          // Just use the default locale as a final fallback
+          path = "en-US";
+        }
+      }
+    }
+    this._activityStreamPath = `${path}/`;
+  },
+
   /*
    * Returns the default URL.
    *
@@ -173,9 +210,18 @@ AboutNewTabService.prototype = {
    */
   get defaultURL() {
     if (this.activityStreamEnabled) {
-      const prerender = this.activityStreamPrerender ? "prerender" : "";
-      const debug = this.activityStreamDebug ? "debug" : "";
-      return ACTIVITY_STREAM_URLS[prerender + debug];
+      // Generate the desired activity stream resource depending on state, e.g.,
+      // resource://activity-stream/prerendered/ar/activity-stream.html
+      // resource://activity-stream/prerendered/en-US/activity-stream-prerendered.html
+      // resource://activity-stream/prerendered/static/activity-stream-debug.html
+      return [
+        "resource://activity-stream/prerendered/",
+        this._activityStreamPath,
+        "activity-stream",
+        this._activityStreamPrerender ? "-prerendered" : "",
+        this._activityStreamDebug ? "-debug" : "",
+        ".html"
+      ].join("");
     }
     return LOCAL_NEWTAB_URL;
   },
@@ -197,7 +243,7 @@ AboutNewTabService.prototype = {
     this.toggleActivityStream(false);
     this._newTabURL = aNewTabURL;
     this._overridden = true;
-    Services.obs.notifyObservers(null, "newtab-url-changed", this._newTabURL);
+    this.notifyChange();
   },
 
   get overridden() {
@@ -220,14 +266,15 @@ AboutNewTabService.prototype = {
     this._overridden = false;
     this._newTabURL = ABOUT_URL;
     this.toggleActivityStream(undefined, true);
-    Services.obs.notifyObservers(null, "newtab-url-changed", this._newTabURL);
+    this.notifyChange();
   },
 
   uninit() {
     if (!this.initialized) {
       return;
     }
-    Services.obs.removeObserver(this, "quit-application-granted");
+    Services.obs.removeObserver(this, TOPIC_APP_QUIT);
+    Services.obs.removeObserver(this, TOPIC_LOCALES_CHANGE);
     Services.prefs.removeObserver(PREF_ACTIVITY_STREAM_ENABLED, this);
     Services.prefs.removeObserver(PREF_ACTIVITY_STREAM_PRERENDER_ENABLED, this);
     if (!IS_RELEASE_OR_BETA) {
diff --git a/browser/components/newtab/tests/browser/browser.ini b/browser/components/newtab/tests/browser/browser.ini
index c02769ca67f4..0486f7cb7a03 100644
--- a/browser/components/newtab/tests/browser/browser.ini
+++ b/browser/components/newtab/tests/browser/browser.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
 
+[browser_packaged_as_locales.js]
 [browser_newtab_overrides.js]
diff --git a/browser/components/newtab/tests/browser/browser_packaged_as_locales.js b/browser/components/newtab/tests/browser/browser_packaged_as_locales.js
new file mode 100644
index 000000000000..7c4628e9b179
--- /dev/null
+++ b/browser/components/newtab/tests/browser/browser_packaged_as_locales.js
@@ -0,0 +1,52 @@
+const LOCALE_PREF = "general.useragent.locale";
+
+XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
+                                   "@mozilla.org/browser/aboutnewtab-service;1",
+                                   "nsIAboutNewTabService");
+
+const DEFAULT_URL = "resource://activity-stream/prerendered/en-US/activity-stream-prerendered.html";
+async function getUrlForLocale(locale) {
+  await SpecialPowers.pushPrefEnv({set: [[LOCALE_PREF, locale]]});
+  return aboutNewTabService.defaultURL;
+}
+
+/**
+ * Test that an unknown locale defaults to en-US
+ */
+add_task(async function test_unknown_locale() {
+  const url = await getUrlForLocale("foo-BAR");
+  Assert.equal(url, DEFAULT_URL);
+});
+
+/**
+ * Test that we at least have en-US
+ */
+add_task(async function test_default_locale() {
+  const url = await getUrlForLocale("en-US");
+  Assert.equal(url, DEFAULT_URL);
+});
+
+/**
+ * Test that we use a shared language before en-US
+ */
+add_task(async function test_default_locale() {
+  const url = await getUrlForLocale("de-UNKNOWN");
+  Assert.equal(url, DEFAULT_URL.replace("en-US", "de"));
+});
+
+/**
+ * Tests that all activity stream packaged locales can be referenced / accessed
+ */
+add_task(async function test_all_packaged_locales() {
+  const listing = await (await fetch("resource://activity-stream/prerendered/")).text();
+  for (const line of listing.split("\n").slice(2)) {
+    const [file, , , type] = line.split(" ").slice(1);
+    if (type === "DIRECTORY") {
+      const locale = file.replace("/", "");
+      if (locale !== "static") {
+        const url = await getUrlForLocale(locale);
+        Assert[locale === "en-US" ? "equal" : "notEqual"](url, DEFAULT_URL);
+      }
+    }
+  }
+});
diff --git a/browser/components/newtab/tests/xpcshell/test_AboutNewTabService.js b/browser/components/newtab/tests/xpcshell/test_AboutNewTabService.js
index 32c57681b610..7604e7628de1 100644
--- a/browser/components/newtab/tests/xpcshell/test_AboutNewTabService.js
+++ b/browser/components/newtab/tests/xpcshell/test_AboutNewTabService.js
@@ -15,10 +15,10 @@ XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
 
 const IS_RELEASE_OR_BETA = AppConstants.RELEASE_OR_BETA;
 
-const ACTIVITY_STREAM_PRERENDER_URL = "resource://activity-stream/data/content/activity-stream-prerendered.html";
-const ACTIVITY_STREAM_PRERENDER_DEBUG_URL = "resource://activity-stream/data/content/activity-stream-prerendered-debug.html";
-const ACTIVITY_STREAM_URL = "resource://activity-stream/data/content/activity-stream.html";
-const ACTIVITY_STREAM_DEBUG_URL = "resource://activity-stream/data/content/activity-stream-debug.html";
+const ACTIVITY_STREAM_PRERENDER_URL = "resource://activity-stream/prerendered/en-US/activity-stream-prerendered.html";
+const ACTIVITY_STREAM_PRERENDER_DEBUG_URL = "resource://activity-stream/prerendered/static/activity-stream-prerendered-debug.html";
+const ACTIVITY_STREAM_URL = "resource://activity-stream/prerendered/en-US/activity-stream.html";
+const ACTIVITY_STREAM_DEBUG_URL = "resource://activity-stream/prerendered/static/activity-stream-debug.html";
 
 const DEFAULT_CHROME_URL = "chrome://browser/content/newtab/newTab.xhtml";
 const DOWNLOADS_URL = "chrome://browser/content/downloads/contentAreaDownloadsView.xul";
diff --git a/browser/extensions/activity-stream/jar.mn b/browser/extensions/activity-stream/jar.mn
index 866231924d67..07b78cbdbd7e 100644
--- a/browser/extensions/activity-stream/jar.mn
+++ b/browser/extensions/activity-stream/jar.mn
@@ -18,384 +18,7 @@
   content/vendor/react-redux.js (./vendor/react-redux.js)
   content/data/ (./data/*)
 #ifndef RELEASE_OR_BETA
-  content/data/content/activity-stream-debug.html (./prerendered/en-US/activity-stream-debug.html)
-  content/data/content/activity-stream-prerendered-debug.html (./prerendered/en-US/activity-stream-prerendered-debug.html)
-#endif
-
-# These defines and ifs below are generated by https://github.com/mozilla/activity-stream/blob/master/bin/render-activity-stream-html.js
-#define bn_BD bn-BD
-#define bn_IN bn-IN
-#define en_GB en-GB
-#define es_AR es-AR
-#define es_CL es-CL
-#define es_ES es-ES
-#define es_MX es-MX
-#define fy_NL fy-NL
-#define ga_IE ga-IE
-#define gu_IN gu-IN
-#define hi_IN hi-IN
-#define hy_AM hy-AM
-#define ja_JP_mac ja-JP-mac
-#define nb_NO nb-NO
-#define ne_NP ne-NP
-#define nn_NO nn-NO
-#define pa_IN pa-IN
-#define pt_BR pt-BR
-#define pt_PT pt-PT
-#define sv_SE sv-SE
-#define ta_LK ta-LK
-#define zh_CN zh-CN
-#define zh_TW zh-TW
-#if AB_CD == ach
-  content/data/content/activity-stream-initial-state.js (./prerendered/ach/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ach/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ach/activity-stream.html)
-#elif AB_CD == ar
-  content/data/content/activity-stream-initial-state.js (./prerendered/ar/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ar/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ar/activity-stream.html)
-#elif AB_CD == ast
-  content/data/content/activity-stream-initial-state.js (./prerendered/ast/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ast/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ast/activity-stream.html)
-#elif AB_CD == az
-  content/data/content/activity-stream-initial-state.js (./prerendered/az/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/az/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/az/activity-stream.html)
-#elif AB_CD == be
-  content/data/content/activity-stream-initial-state.js (./prerendered/be/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/be/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/be/activity-stream.html)
-#elif AB_CD == bg
-  content/data/content/activity-stream-initial-state.js (./prerendered/bg/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/bg/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/bg/activity-stream.html)
-#elif AB_CD == bn_BD
-  content/data/content/activity-stream-initial-state.js (./prerendered/bn-BD/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/bn-BD/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/bn-BD/activity-stream.html)
-#elif AB_CD == bn_IN
-  content/data/content/activity-stream-initial-state.js (./prerendered/bn-IN/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/bn-IN/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/bn-IN/activity-stream.html)
-#elif AB_CD == br
-  content/data/content/activity-stream-initial-state.js (./prerendered/br/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/br/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/br/activity-stream.html)
-#elif AB_CD == bs
-  content/data/content/activity-stream-initial-state.js (./prerendered/bs/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/bs/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/bs/activity-stream.html)
-#elif AB_CD == ca
-  content/data/content/activity-stream-initial-state.js (./prerendered/ca/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ca/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ca/activity-stream.html)
-#elif AB_CD == cak
-  content/data/content/activity-stream-initial-state.js (./prerendered/cak/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/cak/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/cak/activity-stream.html)
-#elif AB_CD == cs
-  content/data/content/activity-stream-initial-state.js (./prerendered/cs/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/cs/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/cs/activity-stream.html)
-#elif AB_CD == cy
-  content/data/content/activity-stream-initial-state.js (./prerendered/cy/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/cy/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/cy/activity-stream.html)
-#elif AB_CD == da
-  content/data/content/activity-stream-initial-state.js (./prerendered/da/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/da/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/da/activity-stream.html)
-#elif AB_CD == de
-  content/data/content/activity-stream-initial-state.js (./prerendered/de/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/de/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/de/activity-stream.html)
-#elif AB_CD == dsb
-  content/data/content/activity-stream-initial-state.js (./prerendered/dsb/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/dsb/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/dsb/activity-stream.html)
-#elif AB_CD == el
-  content/data/content/activity-stream-initial-state.js (./prerendered/el/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/el/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/el/activity-stream.html)
-#elif AB_CD == en_GB
-  content/data/content/activity-stream-initial-state.js (./prerendered/en-GB/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/en-GB/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/en-GB/activity-stream.html)
-#elif AB_CD == eo
-  content/data/content/activity-stream-initial-state.js (./prerendered/eo/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/eo/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/eo/activity-stream.html)
-#elif AB_CD == es_AR
-  content/data/content/activity-stream-initial-state.js (./prerendered/es-AR/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/es-AR/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/es-AR/activity-stream.html)
-#elif AB_CD == es_CL
-  content/data/content/activity-stream-initial-state.js (./prerendered/es-CL/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/es-CL/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/es-CL/activity-stream.html)
-#elif AB_CD == es_ES
-  content/data/content/activity-stream-initial-state.js (./prerendered/es-ES/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/es-ES/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/es-ES/activity-stream.html)
-#elif AB_CD == es_MX
-  content/data/content/activity-stream-initial-state.js (./prerendered/es-MX/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/es-MX/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/es-MX/activity-stream.html)
-#elif AB_CD == et
-  content/data/content/activity-stream-initial-state.js (./prerendered/et/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/et/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/et/activity-stream.html)
-#elif AB_CD == eu
-  content/data/content/activity-stream-initial-state.js (./prerendered/eu/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/eu/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/eu/activity-stream.html)
-#elif AB_CD == fa
-  content/data/content/activity-stream-initial-state.js (./prerendered/fa/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/fa/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/fa/activity-stream.html)
-#elif AB_CD == fi
-  content/data/content/activity-stream-initial-state.js (./prerendered/fi/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/fi/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/fi/activity-stream.html)
-#elif AB_CD == fr
-  content/data/content/activity-stream-initial-state.js (./prerendered/fr/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/fr/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/fr/activity-stream.html)
-#elif AB_CD == fy_NL
-  content/data/content/activity-stream-initial-state.js (./prerendered/fy-NL/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/fy-NL/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/fy-NL/activity-stream.html)
-#elif AB_CD == ga_IE
-  content/data/content/activity-stream-initial-state.js (./prerendered/ga-IE/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ga-IE/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ga-IE/activity-stream.html)
-#elif AB_CD == gd
-  content/data/content/activity-stream-initial-state.js (./prerendered/gd/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/gd/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/gd/activity-stream.html)
-#elif AB_CD == gu_IN
-  content/data/content/activity-stream-initial-state.js (./prerendered/gu-IN/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/gu-IN/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/gu-IN/activity-stream.html)
-#elif AB_CD == he
-  content/data/content/activity-stream-initial-state.js (./prerendered/he/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/he/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/he/activity-stream.html)
-#elif AB_CD == hi_IN
-  content/data/content/activity-stream-initial-state.js (./prerendered/hi-IN/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/hi-IN/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/hi-IN/activity-stream.html)
-#elif AB_CD == hr
-  content/data/content/activity-stream-initial-state.js (./prerendered/hr/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/hr/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/hr/activity-stream.html)
-#elif AB_CD == hsb
-  content/data/content/activity-stream-initial-state.js (./prerendered/hsb/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/hsb/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/hsb/activity-stream.html)
-#elif AB_CD == hu
-  content/data/content/activity-stream-initial-state.js (./prerendered/hu/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/hu/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/hu/activity-stream.html)
-#elif AB_CD == hy_AM
-  content/data/content/activity-stream-initial-state.js (./prerendered/hy-AM/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/hy-AM/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/hy-AM/activity-stream.html)
-#elif AB_CD == ia
-  content/data/content/activity-stream-initial-state.js (./prerendered/ia/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ia/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ia/activity-stream.html)
-#elif AB_CD == id
-  content/data/content/activity-stream-initial-state.js (./prerendered/id/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/id/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/id/activity-stream.html)
-#elif AB_CD == it
-  content/data/content/activity-stream-initial-state.js (./prerendered/it/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/it/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/it/activity-stream.html)
-#elif AB_CD == ja
-  content/data/content/activity-stream-initial-state.js (./prerendered/ja/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ja/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ja/activity-stream.html)
-#elif AB_CD == ja_JP_mac
-  content/data/content/activity-stream-initial-state.js (./prerendered/ja-JP-mac/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ja-JP-mac/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ja-JP-mac/activity-stream.html)
-#elif AB_CD == ka
-  content/data/content/activity-stream-initial-state.js (./prerendered/ka/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ka/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ka/activity-stream.html)
-#elif AB_CD == kab
-  content/data/content/activity-stream-initial-state.js (./prerendered/kab/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/kab/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/kab/activity-stream.html)
-#elif AB_CD == kk
-  content/data/content/activity-stream-initial-state.js (./prerendered/kk/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/kk/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/kk/activity-stream.html)
-#elif AB_CD == km
-  content/data/content/activity-stream-initial-state.js (./prerendered/km/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/km/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/km/activity-stream.html)
-#elif AB_CD == kn
-  content/data/content/activity-stream-initial-state.js (./prerendered/kn/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/kn/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/kn/activity-stream.html)
-#elif AB_CD == ko
-  content/data/content/activity-stream-initial-state.js (./prerendered/ko/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ko/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ko/activity-stream.html)
-#elif AB_CD == lij
-  content/data/content/activity-stream-initial-state.js (./prerendered/lij/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/lij/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/lij/activity-stream.html)
-#elif AB_CD == lo
-  content/data/content/activity-stream-initial-state.js (./prerendered/lo/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/lo/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/lo/activity-stream.html)
-#elif AB_CD == lt
-  content/data/content/activity-stream-initial-state.js (./prerendered/lt/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/lt/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/lt/activity-stream.html)
-#elif AB_CD == lv
-  content/data/content/activity-stream-initial-state.js (./prerendered/lv/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/lv/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/lv/activity-stream.html)
-#elif AB_CD == mk
-  content/data/content/activity-stream-initial-state.js (./prerendered/mk/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/mk/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/mk/activity-stream.html)
-#elif AB_CD == ml
-  content/data/content/activity-stream-initial-state.js (./prerendered/ml/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ml/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ml/activity-stream.html)
-#elif AB_CD == mr
-  content/data/content/activity-stream-initial-state.js (./prerendered/mr/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/mr/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/mr/activity-stream.html)
-#elif AB_CD == ms
-  content/data/content/activity-stream-initial-state.js (./prerendered/ms/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ms/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ms/activity-stream.html)
-#elif AB_CD == my
-  content/data/content/activity-stream-initial-state.js (./prerendered/my/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/my/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/my/activity-stream.html)
-#elif AB_CD == nb_NO
-  content/data/content/activity-stream-initial-state.js (./prerendered/nb-NO/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/nb-NO/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/nb-NO/activity-stream.html)
-#elif AB_CD == ne_NP
-  content/data/content/activity-stream-initial-state.js (./prerendered/ne-NP/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ne-NP/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ne-NP/activity-stream.html)
-#elif AB_CD == nl
-  content/data/content/activity-stream-initial-state.js (./prerendered/nl/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/nl/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/nl/activity-stream.html)
-#elif AB_CD == nn_NO
-  content/data/content/activity-stream-initial-state.js (./prerendered/nn-NO/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/nn-NO/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/nn-NO/activity-stream.html)
-#elif AB_CD == pa_IN
-  content/data/content/activity-stream-initial-state.js (./prerendered/pa-IN/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/pa-IN/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/pa-IN/activity-stream.html)
-#elif AB_CD == pl
-  content/data/content/activity-stream-initial-state.js (./prerendered/pl/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/pl/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/pl/activity-stream.html)
-#elif AB_CD == pt_BR
-  content/data/content/activity-stream-initial-state.js (./prerendered/pt-BR/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/pt-BR/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/pt-BR/activity-stream.html)
-#elif AB_CD == pt_PT
-  content/data/content/activity-stream-initial-state.js (./prerendered/pt-PT/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/pt-PT/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/pt-PT/activity-stream.html)
-#elif AB_CD == rm
-  content/data/content/activity-stream-initial-state.js (./prerendered/rm/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/rm/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/rm/activity-stream.html)
-#elif AB_CD == ro
-  content/data/content/activity-stream-initial-state.js (./prerendered/ro/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ro/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ro/activity-stream.html)
-#elif AB_CD == ru
-  content/data/content/activity-stream-initial-state.js (./prerendered/ru/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ru/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ru/activity-stream.html)
-#elif AB_CD == sk
-  content/data/content/activity-stream-initial-state.js (./prerendered/sk/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/sk/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/sk/activity-stream.html)
-#elif AB_CD == sl
-  content/data/content/activity-stream-initial-state.js (./prerendered/sl/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/sl/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/sl/activity-stream.html)
-#elif AB_CD == sq
-  content/data/content/activity-stream-initial-state.js (./prerendered/sq/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/sq/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/sq/activity-stream.html)
-#elif AB_CD == sr
-  content/data/content/activity-stream-initial-state.js (./prerendered/sr/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/sr/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/sr/activity-stream.html)
-#elif AB_CD == sv_SE
-  content/data/content/activity-stream-initial-state.js (./prerendered/sv-SE/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/sv-SE/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/sv-SE/activity-stream.html)
-#elif AB_CD == ta
-  content/data/content/activity-stream-initial-state.js (./prerendered/ta/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ta/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ta/activity-stream.html)
-#elif AB_CD == ta_LK
-  content/data/content/activity-stream-initial-state.js (./prerendered/ta-LK/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ta-LK/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ta-LK/activity-stream.html)
-#elif AB_CD == te
-  content/data/content/activity-stream-initial-state.js (./prerendered/te/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/te/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/te/activity-stream.html)
-#elif AB_CD == th
-  content/data/content/activity-stream-initial-state.js (./prerendered/th/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/th/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/th/activity-stream.html)
-#elif AB_CD == tl
-  content/data/content/activity-stream-initial-state.js (./prerendered/tl/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/tl/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/tl/activity-stream.html)
-#elif AB_CD == tr
-  content/data/content/activity-stream-initial-state.js (./prerendered/tr/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/tr/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/tr/activity-stream.html)
-#elif AB_CD == uk
-  content/data/content/activity-stream-initial-state.js (./prerendered/uk/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/uk/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/uk/activity-stream.html)
-#elif AB_CD == ur
-  content/data/content/activity-stream-initial-state.js (./prerendered/ur/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/ur/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/ur/activity-stream.html)
-#elif AB_CD == uz
-  content/data/content/activity-stream-initial-state.js (./prerendered/uz/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/uz/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/uz/activity-stream.html)
-#elif AB_CD == vi
-  content/data/content/activity-stream-initial-state.js (./prerendered/vi/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/vi/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/vi/activity-stream.html)
-#elif AB_CD == zh_CN
-  content/data/content/activity-stream-initial-state.js (./prerendered/zh-CN/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/zh-CN/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/zh-CN/activity-stream.html)
-#elif AB_CD == zh_TW
-  content/data/content/activity-stream-initial-state.js (./prerendered/zh-TW/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/zh-TW/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/zh-TW/activity-stream.html)
-#else
-  content/data/content/activity-stream-initial-state.js (./prerendered/en-US/activity-stream-initial-state.js)
-  content/data/content/activity-stream-prerendered.html (./prerendered/en-US/activity-stream-prerendered.html)
-  content/data/content/activity-stream.html (./prerendered/en-US/activity-stream.html)
+#  content/prerendered/static/activity-stream-debug.html (./prerendered/en-US/activity-stream-debug.html)
+#  content/prerendered/static/activity-stream-prerendered-debug.html (./prerendered/en-US/activity-stream-prerendered-debug.html)
 #endif
+  content/prerendered/ (./prerendered/*)
diff --git a/browser/extensions/activity-stream/prerendered/ach/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ach/activity-stream-prerendered.html
index 718ffc8b8ac6..83b0ac882254 100644
--- a/browser/extensions/activity-stream/prerendered/ach/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ach/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ach/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ar/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ar/activity-stream-prerendered.html
index e6b0d9a143f0..d820a4fb6975 100644
--- a/browser/extensions/activity-stream/prerendered/ar/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ar/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ar/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ast/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ast/activity-stream-prerendered.html
index 8a2a818cf7f7..67dc97d4d35b 100644
--- a/browser/extensions/activity-stream/prerendered/ast/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ast/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ast/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/az/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/az/activity-stream-prerendered.html
index abfafc9de5d5..eb66f92ea3a7 100644
--- a/browser/extensions/activity-stream/prerendered/az/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/az/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/az/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/be/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/be/activity-stream-prerendered.html
index ca63727afe8a..5ce08c1307aa 100644
--- a/browser/extensions/activity-stream/prerendered/be/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/be/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/be/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/bg/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/bg/activity-stream-prerendered.html
index f503a22ae7fd..b3cf8ab3e198 100644
--- a/browser/extensions/activity-stream/prerendered/bg/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/bg/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/bg/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/bn-BD/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/bn-BD/activity-stream-prerendered.html
index bc9d97ac9ac8..7645c4aa1b8f 100644
--- a/browser/extensions/activity-stream/prerendered/bn-BD/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/bn-BD/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/bn-BD/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/bn-IN/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/bn-IN/activity-stream-prerendered.html
index 6b1d4a84b2e3..36fd0bded76a 100644
--- a/browser/extensions/activity-stream/prerendered/bn-IN/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/bn-IN/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/bn-IN/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/br/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/br/activity-stream-prerendered.html
index 5d26596db4a9..16caee9e93e1 100644
--- a/browser/extensions/activity-stream/prerendered/br/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/br/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/br/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/bs/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/bs/activity-stream-prerendered.html
index 9e95215d2674..38b0326de93c 100644
--- a/browser/extensions/activity-stream/prerendered/bs/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/bs/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/bs/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ca/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ca/activity-stream-prerendered.html
index d201e1f1a369..c0aa4cf5edf1 100644
--- a/browser/extensions/activity-stream/prerendered/ca/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ca/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ca/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/cak/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/cak/activity-stream-prerendered.html
index cac576010716..bbf0dbbbebb1 100644
--- a/browser/extensions/activity-stream/prerendered/cak/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/cak/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/cak/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/cs/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/cs/activity-stream-prerendered.html
index c32b28a5068d..a0a55936b671 100644
--- a/browser/extensions/activity-stream/prerendered/cs/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/cs/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/cs/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/cy/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/cy/activity-stream-prerendered.html
index f4a405393ef3..5d4e2b99050d 100644
--- a/browser/extensions/activity-stream/prerendered/cy/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/cy/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/cy/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/da/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/da/activity-stream-prerendered.html
index ce93b336e2c0..6b93bad9f676 100644
--- a/browser/extensions/activity-stream/prerendered/da/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/da/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/da/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/de/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/de/activity-stream-prerendered.html
index 559fb34f46a5..83e4e3c5861d 100644
--- a/browser/extensions/activity-stream/prerendered/de/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/de/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/de/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/dsb/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/dsb/activity-stream-prerendered.html
index d7a210758ff4..3e66fef4af21 100644
--- a/browser/extensions/activity-stream/prerendered/dsb/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/dsb/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/dsb/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/el/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/el/activity-stream-prerendered.html
index 0f08642469f8..650bc6af0f59 100644
--- a/browser/extensions/activity-stream/prerendered/el/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/el/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/el/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/en-GB/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/en-GB/activity-stream-prerendered.html
index 849bdb5f1ca5..8f85c4788539 100644
--- a/browser/extensions/activity-stream/prerendered/en-GB/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/en-GB/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/en-GB/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/en-US/activity-stream-prerendered-debug.html b/browser/extensions/activity-stream/prerendered/en-US/activity-stream-prerendered-debug.html
index 1f744201b8fb..08ed2249f6a5 100644
--- a/browser/extensions/activity-stream/prerendered/en-US/activity-stream-prerendered-debug.html
+++ b/browser/extensions/activity-stream/prerendered/en-US/activity-stream-prerendered-debug.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/en-US/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react-dev.js",
   "resource://activity-stream/vendor/react-dom-dev.js",
diff --git a/browser/extensions/activity-stream/prerendered/en-US/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/en-US/activity-stream-prerendered.html
index 110f8ca89fca..89db86ac85ff 100644
--- a/browser/extensions/activity-stream/prerendered/en-US/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/en-US/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/en-US/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/eo/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/eo/activity-stream-prerendered.html
index 27c451e3e811..ea9d4bb09f84 100644
--- a/browser/extensions/activity-stream/prerendered/eo/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/eo/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/eo/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/es-AR/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/es-AR/activity-stream-prerendered.html
index 67025d914cd4..8217fc777c3f 100644
--- a/browser/extensions/activity-stream/prerendered/es-AR/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/es-AR/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/es-AR/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/es-CL/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/es-CL/activity-stream-prerendered.html
index 846bf0fe452a..c2f67023559b 100644
--- a/browser/extensions/activity-stream/prerendered/es-CL/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/es-CL/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/es-CL/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/es-ES/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/es-ES/activity-stream-prerendered.html
index 3daed2726977..ff33246f19fe 100644
--- a/browser/extensions/activity-stream/prerendered/es-ES/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/es-ES/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/es-ES/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/es-MX/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/es-MX/activity-stream-prerendered.html
index 44c91b31da3c..3b5b22e76f30 100644
--- a/browser/extensions/activity-stream/prerendered/es-MX/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/es-MX/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/es-MX/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/et/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/et/activity-stream-prerendered.html
index 163736b2378d..74e38385e6b7 100644
--- a/browser/extensions/activity-stream/prerendered/et/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/et/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/et/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/eu/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/eu/activity-stream-prerendered.html
index 440c5a84ca03..7660a484ea9c 100644
--- a/browser/extensions/activity-stream/prerendered/eu/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/eu/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/eu/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/fa/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/fa/activity-stream-prerendered.html
index 5b735f3386d1..e0b7de859a0b 100644
--- a/browser/extensions/activity-stream/prerendered/fa/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/fa/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/fa/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/fi/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/fi/activity-stream-prerendered.html
index 603c59457bb8..51f54dc5475b 100644
--- a/browser/extensions/activity-stream/prerendered/fi/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/fi/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/fi/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/fr/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/fr/activity-stream-prerendered.html
index 5b2432846a36..792586cf48e1 100644
--- a/browser/extensions/activity-stream/prerendered/fr/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/fr/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/fr/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/fy-NL/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/fy-NL/activity-stream-prerendered.html
index 7148197aea58..3017fb30f83d 100644
--- a/browser/extensions/activity-stream/prerendered/fy-NL/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/fy-NL/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/fy-NL/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ga-IE/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ga-IE/activity-stream-prerendered.html
index 5424a5c526a6..d2c341e6c0e1 100644
--- a/browser/extensions/activity-stream/prerendered/ga-IE/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ga-IE/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ga-IE/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/gd/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/gd/activity-stream-prerendered.html
index 34c4455c28c8..8271ba0f3dc1 100644
--- a/browser/extensions/activity-stream/prerendered/gd/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/gd/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/gd/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/gu-IN/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/gu-IN/activity-stream-prerendered.html
index 8892950f91ce..639a44191e65 100644
--- a/browser/extensions/activity-stream/prerendered/gu-IN/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/gu-IN/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/gu-IN/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/he/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/he/activity-stream-prerendered.html
index 1d690d676421..ec278897c626 100644
--- a/browser/extensions/activity-stream/prerendered/he/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/he/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/he/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/hi-IN/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/hi-IN/activity-stream-prerendered.html
index 28037710b2e5..38d70170c50c 100644
--- a/browser/extensions/activity-stream/prerendered/hi-IN/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/hi-IN/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/hi-IN/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/hr/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/hr/activity-stream-prerendered.html
index 88473e24a47a..fa11c2d9225f 100644
--- a/browser/extensions/activity-stream/prerendered/hr/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/hr/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/hr/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/hsb/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/hsb/activity-stream-prerendered.html
index 319485179cb0..94c4b70db114 100644
--- a/browser/extensions/activity-stream/prerendered/hsb/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/hsb/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/hsb/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/hu/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/hu/activity-stream-prerendered.html
index c07804274775..7ce5b0eaddbc 100644
--- a/browser/extensions/activity-stream/prerendered/hu/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/hu/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/hu/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/hy-AM/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/hy-AM/activity-stream-prerendered.html
index b510ef2e45a5..886f756e2aeb 100644
--- a/browser/extensions/activity-stream/prerendered/hy-AM/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/hy-AM/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/hy-AM/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ia/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ia/activity-stream-prerendered.html
index 6ddbb9733500..5720cd5b2731 100644
--- a/browser/extensions/activity-stream/prerendered/ia/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ia/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ia/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/id/activity-stream-initial-state.js b/browser/extensions/activity-stream/prerendered/id/activity-stream-initial-state.js
new file mode 100644
index 000000000000..6bf4527f72ad
--- /dev/null
+++ b/browser/extensions/activity-stream/prerendered/id/activity-stream-initial-state.js
@@ -0,0 +1,162 @@
+// Note - this is a generated file.
+  window.gActivityStreamPrerenderedState = {
+  "TopSites": {
+    "initialized": false,
+    "rows": [],
+    "editForm": {
+      "visible": false,
+      "site": null
+    }
+  },
+  "App": {
+    "initialized": false,
+    "locale": "id",
+    "strings": {
+      "newtab_page_title": "Tab Baru",
+      "default_label_loading": "Memuat…",
+      "header_top_sites": "Situs Teratas",
+      "header_stories": "Cerita Utama",
+      "header_highlights": "Sorotan",
+      "header_visit_again": "Kunjungi Lagi",
+      "header_bookmarks": "Markah Terbaru",
+      "header_recommended_by": "Disarankan oleh {provider}",
+      "header_bookmarks_placeholder": "Anda belum memiliki markah.",
+      "header_stories_from": "dari",
+      "type_label_visited": "Dikunjungi",
+      "type_label_bookmarked": "Dimarkahi",
+      "type_label_synced": "Disinkronkan dari perangkat lain",
+      "type_label_recommended": "Trending",
+      "type_label_open": "Buka",
+      "type_label_topic": "Topik",
+      "type_label_now": "Sekarang",
+      "menu_action_bookmark": "Markah",
+      "menu_action_remove_bookmark": "Hapus Markah",
+      "menu_action_copy_address": "Salin Alamat",
+      "menu_action_email_link": "Emailkan Tautan…",
+      "menu_action_open_new_window": "Buka di Jendela Baru",
+      "menu_action_open_private_window": "Buka di Jendela Penjelajahan Pribadi Baru",
+      "menu_action_dismiss": "Tutup",
+      "menu_action_delete": "Hapus dari Riwayat",
+      "menu_action_pin": "Semat",
+      "menu_action_unpin": "Lepas",
+      "confirm_history_delete_p1": "Yakin ingin menghapus setiap bagian dari laman ini dari riwayat Anda?",
+      "confirm_history_delete_notice_p2": "Tindakan ini tidak bisa diurungkan.",
+      "menu_action_save_to_pocket": "Simpan ke Pocket",
+      "search_for_something_with": "Cari {search_term} lewat:",
+      "search_button": "Cari",
+      "search_header": "Pencarian {search_engine_name}",
+      "search_web_placeholder": "Cari di Web",
+      "search_settings": "Ubah Pengaturan Pencarian",
+      "section_info_option": "Info",
+      "section_info_send_feedback": "Kirim Umpan Balik",
+      "section_info_privacy_notice": "Kebijakan Privasi",
+      "welcome_title": "Selamat datang di tab baru",
+      "welcome_body": "Firefox akan menggunakan ruang ini untuk menampilkan markah, artikel, video, dan laman yang baru-baru ini dikunjungi, yang paling relevan agar Anda bisa kembali mengunjunginya dengan mudah.",
+      "welcome_label": "Mengidentifikasi Sorotan Anda",
+      "time_label_less_than_minute": "<1 mnt",
+      "time_label_minute": "{number} mnt",
+      "time_label_hour": "{number} jam",
+      "time_label_day": "{number} hr",
+      "settings_pane_button_label": "Ubahsuai laman Tab Baru Anda",
+      "settings_pane_header": "Preferensi Tab Baru",
+      "settings_pane_body2": "Pilih apa yang Anda lihat di halaman ini.",
+      "settings_pane_search_header": "Pencarian",
+      "settings_pane_search_body": "Cari Web dari tab baru Anda.",
+      "settings_pane_topsites_header": "Situs Teratas",
+      "settings_pane_topsites_body": "Mengakses situs web yang paling sering Anda kunjungi.",
+      "settings_pane_topsites_options_showmore": "Tampilkan dua baris",
+      "settings_pane_bookmarks_header": "Markah Terbaru",
+      "settings_pane_bookmarks_body": "Markah Anda dibuat di lokasi yang praktis.",
+      "settings_pane_visit_again_header": "Kunjungi Lagi",
+      "settings_pane_visit_again_body": "Firefox akan menunjukkan bagian dari riwayat penjelajahan yang mungkin ingin Anda ingat atau kunjungi lagi.",
+      "settings_pane_highlights_header": "Sorotan",
+      "settings_pane_highlights_body2": "Temukan jalan kembali ke hal menarik yang baru saja Anda kunjungi atau dimarkah.",
+      "settings_pane_highlights_options_bookmarks": "Markah",
+      "settings_pane_highlights_options_visited": "Situs Terkunjungi",
+      "settings_pane_snippets_header": "Catatan Kecil",
+      "settings_pane_snippets_body": "Baca info pendek terbaru dari Mozilla tentang Firefox, budaya internet dan beberapa meme acak.",
+      "settings_pane_done_button": "Selesai",
+      "settings_pane_topstories_options_sponsored": "Show Sponsored Stories",
+      "edit_topsites_button_text": "Sunting",
+      "edit_topsites_button_label": "Ubahsuai bagian Situs Teratas Anda",
+      "edit_topsites_showmore_button": "Tampilkan lainnya",
+      "edit_topsites_showless_button": "Tampilkan lebih sedikit",
+      "edit_topsites_done_button": "Selesai",
+      "edit_topsites_pin_button": "Sematkan situs ini",
+      "edit_topsites_unpin_button": "Lepaskan situs ini",
+      "edit_topsites_edit_button": "Sunting situs ini",
+      "edit_topsites_dismiss_button": "Abaikan situs ini",
+      "edit_topsites_add_button": "Tambah",
+      "topsites_form_add_header": "Situs Pilihan Baru",
+      "topsites_form_edit_header": "Ubah Situs Pilihan",
+      "topsites_form_title_placeholder": "Masukkan judul",
+      "topsites_form_url_placeholder": "Ketik atau tempel URL",
+      "topsites_form_add_button": "Tambah",
+      "topsites_form_save_button": "Simpan",
+      "topsites_form_cancel_button": "Batalkan",
+      "topsites_form_url_validation": "URL valid diperlukan",
+      "pocket_read_more": "Topik Populer:",
+      "pocket_read_even_more": "Lihat Cerita Lainnya",
+      "pocket_feedback_header": "Yang terbaik dari Web, dikurasi lebih dari 25 juta orang.",
+      "pocket_description": "Temukan konten berkualitas tinggi yang mungkin Anda lewatkan dengan bantuan Pocket, yang sekarang menjadi bagian dari Mozilla.",
+      "highlights_empty_state": "Mulai menjelajah, dan kami akan menampilkan beberapa artikel bagus, video, dan halaman lain yang baru saja Anda kunjungi atau termarkah di sini.",
+      "topstories_empty_state": "Maaf Anda tercegat. Periksa lagi nanti untuk lebih banyak cerita terbaik dari {provider}. Tidak mau menunggu? Pilih topik populer untuk menemukan lebih banyak cerita hebat dari seluruh web.",
+      "manual_migration_explanation2": "Coba Firefox dengan markah, riwayat, dan sandi dari peramban lain.",
+      "manual_migration_cancel_button": "Tidak, Terima kasih",
+      "manual_migration_import_button": "Impor Sekarang"
+    },
+    "textDirection": "ltr",
+    "version": null
+  },
+  "Snippets": {
+    "initialized": false
+  },
+  "Prefs": {
+    "initialized": true,
+    "values": {
+      "migrationExpired": true,
+      "showTopSites": true,
+      "showSearch": true,
+      "topSitesCount": 6,
+      "collapseTopSites": false,
+      "section.highlights.collapsed": false,
+      "section.topstories.collapsed": false,
+      "feeds.section.topstories": true,
+      "feeds.section.highlights": true
+    }
+  },
+  "Dialog": {
+    "visible": false,
+    "data": {}
+  },
+  "Sections": [
+    {
+      "title": {
+        "id": "header_recommended_by",
+        "values": {
+          "provider": "Pocket"
+        }
+      },
+      "rows": [],
+      "order": 1,
+      "enabled": true,
+      "icon": "pocket",
+      "id": "topstories",
+      "initialized": false
+    },
+    {
+      "title": {
+        "id": "header_highlights"
+      },
+      "rows": [],
+      "order": 2,
+      "enabled": true,
+      "id": "highlights",
+      "icon": "highlights",
+      "initialized": false
+    }
+  ],
+  "PreferencesPane": {
+    "visible": false
+  }
+};
diff --git a/browser/extensions/activity-stream/prerendered/id/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/id/activity-stream-prerendered.html
new file mode 100644
index 000000000000..a74f4960c0aa
--- /dev/null
+++ b/browser/extensions/activity-stream/prerendered/id/activity-stream-prerendered.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<html lang="id" dir="ltr">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Security-Policy-Report-Only" content="script-src 'unsafe-inline'; img-src http: https: data: blob:; style-src 'unsafe-inline'; child-src 'none'; object-src 'none'; report-uri https://tiles.services.mozilla.com/v4/links/activity-stream/csp">
+    <title>Tab Baru</title>
+    <link rel="icon" type="image/png" id="favicon" href="chrome://branding/content/icon32.png"/>
+    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
+    <link rel="stylesheet" href="resource://activity-stream/data/content/activity-stream.css" />
+  </head>
+  <body class="activity-stream">
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1271924812"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cari di Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cari di Web" title="Cari di Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cari" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cari</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Situs Teratas</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Situs Teratas</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Mengakses situs web yang paling sering Anda kunjungi.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferensi Tab Baru</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><a data-reactid="32"><div class="tile" aria-hidden="true" data-reactid="33"><span class="letter-fallback" data-reactid="34"></span><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a></li><li class="top-site-outer placeholder" data-reactid="38"><a data-reactid="39"><div class="tile" aria-hidden="true" data-reactid="40"><span class="letter-fallback" data-reactid="41"></span><div class="screenshot" style="background-image:none;" data-reactid="42"></div></div><div class="title " data-reactid="43"><span dir="auto" data-reactid="44"></span></div></a></li><li class="top-site-outer placeholder" data-reactid="45"><a data-reactid="46"><div class="tile" aria-hidden="true" data-reactid="47"><span class="letter-fallback" data-reactid="48"></span><div class="screenshot" style="background-image:none;" data-reactid="49"></div></div><div class="title " data-reactid="50"><span dir="auto" data-reactid="51"></span></div></a></li><li class="top-site-outer placeholder" data-reactid="52"><a data-reactid="53"><div class="tile" aria-hidden="true" data-reactid="54"><span class="letter-fallback" data-reactid="55"></span><div class="screenshot" style="background-image:none;" data-reactid="56"></div></div><div class="title " data-reactid="57"><span dir="auto" data-reactid="58"></span></div></a></li><li class="top-site-outer placeholder" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><span class="letter-fallback" data-reactid="62"></span><div class="screenshot" style="background-image:none;" data-reactid="63"></div></div><div class="title " data-reactid="64"><span dir="auto" data-reactid="65"></span></div></a></li><li class="top-site-outer placeholder" data-reactid="66"><a data-reactid="67"><div class="tile" aria-hidden="true" data-reactid="68"><span class="letter-fallback" data-reactid="69"></span><div class="screenshot" style="background-image:none;" data-reactid="70"></div></div><div class="title " data-reactid="71"><span dir="auto" data-reactid="72"></span></div></a></li></ul><div class="edit-topsites-wrapper" data-reactid="73"><div class="edit-topsites-button" data-reactid="74"><button class="edit" title="Ubahsuai bagian Situs Teratas Anda" data-reactid="75"><span data-reactid="76">Sunting</span></button></div></div></div></section><div class="sections-list" data-reactid="77"><section class="collapsible-section section animation-enabled" data-reactid="78"><div class="section-top-bar" data-reactid="79"><h3 class="section-title" data-reactid="80"><span class="click-target" data-reactid="81"><span class="icon icon-small-spacer icon-pocket" data-reactid="82"></span><span data-reactid="83">Disarankan oleh Pocket</span><span class="icon icon-arrowhead-down" data-reactid="84"></span></span></h3></div><div class="section-body" data-reactid="85"><ul class="section-list" style="padding:0;" data-reactid="86"><li class="card-outer placeholder" data-reactid="87"><a data-reactid="88"><div class="card" data-reactid="89"><div class="card-details no-image" data-reactid="90"><div class="card-text no-context no-description no-host-name no-image" data-reactid="91"><h4 class="card-title" dir="auto" data-reactid="92"></h4><p class="card-description" dir="auto" data-reactid="93"></p></div><div class="card-context" data-reactid="94"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="95"><a data-reactid="96"><div class="card" data-reactid="97"><div class="card-details no-image" data-reactid="98"><div class="card-text no-context no-description no-host-name no-image" data-reactid="99"><h4 class="card-title" dir="auto" data-reactid="100"></h4><p class="card-description" dir="auto" data-reactid="101"></p></div><div class="card-context" data-reactid="102"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="103"><a data-reactid="104"><div class="card" data-reactid="105"><div class="card-details no-image" data-reactid="106"><div class="card-text no-context no-description no-host-name no-image" data-reactid="107"><h4 class="card-title" dir="auto" data-reactid="108"></h4><p class="card-description" dir="auto" data-reactid="109"></p></div><div class="card-context" data-reactid="110"></div></div></div></a></li></ul><div class="topic" data-reactid="111"><span data-reactid="112"><span data-reactid="113">Topik Populer:</span></span><ul data-reactid="114"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="115"><div class="section-top-bar" data-reactid="116"><h3 class="section-title" data-reactid="117"><span class="click-target" data-reactid="118"><span class="icon icon-small-spacer icon-highlights" data-reactid="119"></span><span data-reactid="120">Sorotan</span><span class="icon icon-arrowhead-down" data-reactid="121"></span></span></h3></div><div class="section-body" data-reactid="122"><ul class="section-list" style="padding:0;" data-reactid="123"><li class="card-outer placeholder" data-reactid="124"><a data-reactid="125"><div class="card" data-reactid="126"><div class="card-details no-image" data-reactid="127"><div class="card-text no-context no-description no-host-name no-image" data-reactid="128"><h4 class="card-title" dir="auto" data-reactid="129"></h4><p class="card-description" dir="auto" data-reactid="130"></p></div><div class="card-context" data-reactid="131"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="132"><a data-reactid="133"><div class="card" data-reactid="134"><div class="card-details no-image" data-reactid="135"><div class="card-text no-context no-description no-host-name no-image" data-reactid="136"><h4 class="card-title" dir="auto" data-reactid="137"></h4><p class="card-description" dir="auto" data-reactid="138"></p></div><div class="card-context" data-reactid="139"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="140"><a data-reactid="141"><div class="card" data-reactid="142"><div class="card-details no-image" data-reactid="143"><div class="card-text no-context no-description no-host-name no-image" data-reactid="144"><h4 class="card-title" dir="auto" data-reactid="145"></h4><p class="card-description" dir="auto" data-reactid="146"></p></div><div class="card-context" data-reactid="147"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 148 --></main></div></div>
+    <div id="snippets-container">
+      <div id="snippets"></div>
+    </div>
+    <script>
+// Don't directly load the following scripts as part of html to let the page
+// finish loading to render the content sooner.
+for (const src of [
+  "resource://activity-stream/prerendered/id/activity-stream-initial-state.js",
+  "chrome://browser/content/contentSearchUI.js",
+  "resource://activity-stream/vendor/react.js",
+  "resource://activity-stream/vendor/react-dom.js",
+  "resource://activity-stream/vendor/react-intl.js",
+  "resource://activity-stream/vendor/redux.js",
+  "resource://activity-stream/vendor/react-redux.js",
+  "resource://activity-stream/data/content/activity-stream.bundle.js"
+]) {
+  // These dynamically inserted scripts by default are async, but we need them
+  // to load in the desired order (i.e., bundle last).
+  const script = document.body.appendChild(document.createElement("script"));
+  script.async = false;
+  script.src = src;
+}
+    </script>
+  </body>
+</html>
diff --git a/browser/extensions/activity-stream/prerendered/id/activity-stream.html b/browser/extensions/activity-stream/prerendered/id/activity-stream.html
new file mode 100644
index 000000000000..54782f1b287d
--- /dev/null
+++ b/browser/extensions/activity-stream/prerendered/id/activity-stream.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<html lang="id" dir="ltr">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Security-Policy-Report-Only" content="script-src 'unsafe-inline'; img-src http: https: data: blob:; style-src 'unsafe-inline'; child-src 'none'; object-src 'none'; report-uri https://tiles.services.mozilla.com/v4/links/activity-stream/csp">
+    <title>Tab Baru</title>
+    <link rel="icon" type="image/png" id="favicon" href="chrome://branding/content/icon32.png"/>
+    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
+    <link rel="stylesheet" href="resource://activity-stream/data/content/activity-stream.css" />
+  </head>
+  <body class="activity-stream">
+    <div id="root"></div>
+    <div id="snippets-container">
+      <div id="snippets"></div>
+    </div>
+    <script>
+// Don't directly load the following scripts as part of html to let the page
+// finish loading to render the content sooner.
+for (const src of [
+  "chrome://browser/content/contentSearchUI.js",
+  "resource://activity-stream/vendor/react.js",
+  "resource://activity-stream/vendor/react-dom.js",
+  "resource://activity-stream/vendor/react-intl.js",
+  "resource://activity-stream/vendor/redux.js",
+  "resource://activity-stream/vendor/react-redux.js",
+  "resource://activity-stream/data/content/activity-stream.bundle.js"
+]) {
+  // These dynamically inserted scripts by default are async, but we need them
+  // to load in the desired order (i.e., bundle last).
+  const script = document.body.appendChild(document.createElement("script"));
+  script.async = false;
+  script.src = src;
+}
+    </script>
+  </body>
+</html>
diff --git a/browser/extensions/activity-stream/prerendered/it/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/it/activity-stream-prerendered.html
index 4a843300ee47..c17416ffeb96 100644
--- a/browser/extensions/activity-stream/prerendered/it/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/it/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/it/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ja-JP-mac/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ja-JP-mac/activity-stream-prerendered.html
index 2af353974a05..06e334d246ce 100644
--- a/browser/extensions/activity-stream/prerendered/ja-JP-mac/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ja-JP-mac/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ja-JP-mac/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ja/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ja/activity-stream-prerendered.html
index 70c69796be35..24031fba70c4 100644
--- a/browser/extensions/activity-stream/prerendered/ja/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ja/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ja/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ka/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ka/activity-stream-prerendered.html
index 1a1c580dfe8d..3358646fead9 100644
--- a/browser/extensions/activity-stream/prerendered/ka/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ka/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ka/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/kab/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/kab/activity-stream-prerendered.html
index c3b8ecc6ef97..6c7f78638276 100644
--- a/browser/extensions/activity-stream/prerendered/kab/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/kab/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/kab/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/kk/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/kk/activity-stream-prerendered.html
index 44a56f85a666..fc08c51165cc 100644
--- a/browser/extensions/activity-stream/prerendered/kk/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/kk/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/kk/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/km/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/km/activity-stream-prerendered.html
index 17301466423b..62f0c34387e7 100644
--- a/browser/extensions/activity-stream/prerendered/km/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/km/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/km/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/kn/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/kn/activity-stream-prerendered.html
index 0d7d216e73a1..d36aeb784923 100644
--- a/browser/extensions/activity-stream/prerendered/kn/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/kn/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/kn/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ko/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ko/activity-stream-prerendered.html
index 6fc9f45f9755..0b9a6d86eda8 100644
--- a/browser/extensions/activity-stream/prerendered/ko/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ko/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ko/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/lij/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/lij/activity-stream-prerendered.html
index 7c2c1028755b..75e2531e7e2b 100644
--- a/browser/extensions/activity-stream/prerendered/lij/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/lij/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/lij/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/lo/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/lo/activity-stream-prerendered.html
index a192b0f481bd..de82798276ac 100644
--- a/browser/extensions/activity-stream/prerendered/lo/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/lo/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/lo/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/lt/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/lt/activity-stream-prerendered.html
index e29176e7987f..e56a34abf93e 100644
--- a/browser/extensions/activity-stream/prerendered/lt/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/lt/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/lt/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/lv/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/lv/activity-stream-prerendered.html
index 36a56d0fb5d1..15600725d424 100644
--- a/browser/extensions/activity-stream/prerendered/lv/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/lv/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/lv/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/mk/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/mk/activity-stream-prerendered.html
index 9af09e95f032..d623883acfe5 100644
--- a/browser/extensions/activity-stream/prerendered/mk/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/mk/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/mk/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ml/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ml/activity-stream-prerendered.html
index f8f3632eba6e..238277a45c8c 100644
--- a/browser/extensions/activity-stream/prerendered/ml/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ml/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ml/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/mr/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/mr/activity-stream-prerendered.html
index 1c6eeaa2228e..03c810b19738 100644
--- a/browser/extensions/activity-stream/prerendered/mr/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/mr/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/mr/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ms/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ms/activity-stream-prerendered.html
index 469c2124fc6e..1358bad1e507 100644
--- a/browser/extensions/activity-stream/prerendered/ms/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ms/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ms/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/my/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/my/activity-stream-prerendered.html
index 97a23db7b23c..22672d061fff 100644
--- a/browser/extensions/activity-stream/prerendered/my/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/my/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/my/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/nb-NO/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/nb-NO/activity-stream-prerendered.html
index 372648b17de7..0123efb94aa4 100644
--- a/browser/extensions/activity-stream/prerendered/nb-NO/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/nb-NO/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/nb-NO/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ne-NP/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ne-NP/activity-stream-prerendered.html
index a90b8eef312a..c40622ddafb9 100644
--- a/browser/extensions/activity-stream/prerendered/ne-NP/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ne-NP/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ne-NP/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/nl/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/nl/activity-stream-prerendered.html
index 7c7d2e62296d..de49f8d5e516 100644
--- a/browser/extensions/activity-stream/prerendered/nl/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/nl/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/nl/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/nn-NO/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/nn-NO/activity-stream-prerendered.html
index 78c0f4391c51..5b26318021d3 100644
--- a/browser/extensions/activity-stream/prerendered/nn-NO/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/nn-NO/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/nn-NO/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/pa-IN/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/pa-IN/activity-stream-prerendered.html
index f42290bb3c19..8a197242270d 100644
--- a/browser/extensions/activity-stream/prerendered/pa-IN/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/pa-IN/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/pa-IN/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/pl/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/pl/activity-stream-prerendered.html
index e50e973d035d..9d91311c7b76 100644
--- a/browser/extensions/activity-stream/prerendered/pl/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/pl/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/pl/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/pt-BR/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/pt-BR/activity-stream-prerendered.html
index 0d3ac446eeab..7a9cde30d1fd 100644
--- a/browser/extensions/activity-stream/prerendered/pt-BR/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/pt-BR/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/pt-BR/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/pt-PT/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/pt-PT/activity-stream-prerendered.html
index 1bac1c4782cc..ede168e9a573 100644
--- a/browser/extensions/activity-stream/prerendered/pt-PT/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/pt-PT/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/pt-PT/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/rm/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/rm/activity-stream-prerendered.html
index fe5dd5ec4ea3..9cdbad6764a6 100644
--- a/browser/extensions/activity-stream/prerendered/rm/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/rm/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/rm/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ro/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ro/activity-stream-prerendered.html
index 67c31ee884e8..09635de8c0b0 100644
--- a/browser/extensions/activity-stream/prerendered/ro/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ro/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ro/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ru/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ru/activity-stream-prerendered.html
index 2605f3802ebe..cc89dbcecddf 100644
--- a/browser/extensions/activity-stream/prerendered/ru/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ru/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ru/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/sk/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/sk/activity-stream-prerendered.html
index 2ad1449f6972..ad50904bcbf5 100644
--- a/browser/extensions/activity-stream/prerendered/sk/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/sk/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/sk/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/sl/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/sl/activity-stream-prerendered.html
index 58a49a373160..9d6ed956772f 100644
--- a/browser/extensions/activity-stream/prerendered/sl/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/sl/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/sl/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/sq/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/sq/activity-stream-prerendered.html
index 39d6d928c640..430c633b7042 100644
--- a/browser/extensions/activity-stream/prerendered/sq/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/sq/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/sq/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/sr/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/sr/activity-stream-prerendered.html
index f445102a676d..d3dc565fc380 100644
--- a/browser/extensions/activity-stream/prerendered/sr/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/sr/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/sr/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/sv-SE/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/sv-SE/activity-stream-prerendered.html
index 232c9ca4836e..0ef92c42e1a1 100644
--- a/browser/extensions/activity-stream/prerendered/sv-SE/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/sv-SE/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/sv-SE/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ta-LK/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ta-LK/activity-stream-prerendered.html
index d710c9b15919..04a9eb0fc4d9 100644
--- a/browser/extensions/activity-stream/prerendered/ta-LK/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ta-LK/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ta-LK/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ta/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ta/activity-stream-prerendered.html
index b710c9d4b879..640974c5768a 100644
--- a/browser/extensions/activity-stream/prerendered/ta/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ta/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ta/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/te/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/te/activity-stream-prerendered.html
index 49f8ba7a8dc1..8db2bdb3ad77 100644
--- a/browser/extensions/activity-stream/prerendered/te/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/te/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/te/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/th/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/th/activity-stream-prerendered.html
index d9ae3652a7cd..7f62a00345ee 100644
--- a/browser/extensions/activity-stream/prerendered/th/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/th/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/th/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/tl/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/tl/activity-stream-prerendered.html
index cc23525654d5..0cb07af18630 100644
--- a/browser/extensions/activity-stream/prerendered/tl/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/tl/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/tl/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/tr/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/tr/activity-stream-prerendered.html
index 73cbf2daa85b..a66ad5123e68 100644
--- a/browser/extensions/activity-stream/prerendered/tr/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/tr/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/tr/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/uk/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/uk/activity-stream-prerendered.html
index 38841d44e260..734240cb7eac 100644
--- a/browser/extensions/activity-stream/prerendered/uk/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/uk/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/uk/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/ur/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/ur/activity-stream-prerendered.html
index 99b89cb07633..e494e62a78b4 100644
--- a/browser/extensions/activity-stream/prerendered/ur/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/ur/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/ur/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/uz/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/uz/activity-stream-prerendered.html
index ae94ce5a8972..24344e3e4709 100644
--- a/browser/extensions/activity-stream/prerendered/uz/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/uz/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/uz/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/vi/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/vi/activity-stream-prerendered.html
index 9718fc66f8f8..7ab974cdb589 100644
--- a/browser/extensions/activity-stream/prerendered/vi/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/vi/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/vi/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/zh-CN/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/zh-CN/activity-stream-prerendered.html
index 501bd08151e1..956bc91db62b 100644
--- a/browser/extensions/activity-stream/prerendered/zh-CN/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/zh-CN/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/zh-CN/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",
diff --git a/browser/extensions/activity-stream/prerendered/zh-TW/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/zh-TW/activity-stream-prerendered.html
index b46444f37fd8..f67d53f9c044 100644
--- a/browser/extensions/activity-stream/prerendered/zh-TW/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/zh-TW/activity-stream-prerendered.html
@@ -17,7 +17,7 @@
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
-  "resource://activity-stream/data/content/activity-stream-initial-state.js",
+  "resource://activity-stream/prerendered/zh-TW/activity-stream-initial-state.js",
   "chrome://browser/content/contentSearchUI.js",
   "resource://activity-stream/vendor/react.js",
   "resource://activity-stream/vendor/react-dom.js",