diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9e86f1bda..595b58664d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
-<a name="1.2.0"></a>
-# 1.2.0 (2017-01-16)
+<a name="1.3.0"></a>
+# 1.3.0 (2017-01-31)
 
 * Fix(addon): #1620 - Update experimentId for TabTracker upon changes ([445f46c](https://github.com/mozilla/activity-stream/commit/445f46c))
 *  Update to Page Metadata Parser 0.5.2 fixes #1912 ([d3f2a91](https://github.com/mozilla/activity-stream/commit/d3f2a91)), closes [#1912](https://github.com/mozilla/activity-stream/issues/1912)
@@ -14,14 +14,21 @@
 * 1.1.8 changelog ([2753ef1](https://github.com/mozilla/activity-stream/commit/2753ef1))
 * 1.1.9 ([1f0da08](https://github.com/mozilla/activity-stream/commit/1f0da08))
 * 1.1.9 changelog ([67b7148](https://github.com/mozilla/activity-stream/commit/67b7148))
-* 1.2.0 ([2fca6c9](https://github.com/mozilla/activity-stream/commit/2fca6c9))
+* 1.2.0 ([31471c9](https://github.com/mozilla/activity-stream/commit/31471c9))
+* 1.2.0 changelog ([08afc9e](https://github.com/mozilla/activity-stream/commit/08afc9e))
+* 1.3.0 ([b1fc547](https://github.com/mozilla/activity-stream/commit/b1fc547))
 * Add commit hash to the addon version for dev/pre-release channels ([b736cfc](https://github.com/mozilla/activity-stream/commit/b736cfc))
 * Add PureRenderMixin for stateless components ([33d7881](https://github.com/mozilla/activity-stream/commit/33d7881))
 * Add users/bots to .mention-bot blacklist ([24b489c](https://github.com/mozilla/activity-stream/commit/24b489c))
 * catch errors in pageWorker.destroy ([65dd332](https://github.com/mozilla/activity-stream/commit/65dd332))
 * chore (addon): #1386 update to new tippy-top-sites v1.0.1 ([b676d93](https://github.com/mozilla/activity-stream/commit/b676d93))
 * chore(addon) #1502: Remove Timeline-related metrics and actions. ([8952233](https://github.com/mozilla/activity-stream/commit/8952233))
+* chore(testing: #1929 Port HighlightContext tests to enzyme ([fec4682](https://github.com/mozilla/activity-stream/commit/fec4682))
+* enable screenshots experiment for 20% ([0fda037](https://github.com/mozilla/activity-stream/commit/0fda037))
+* feat (content): #1988 new style for top sites (behind screenshots experiment) ([1690723](https://github.com/mozilla/activity-stream/commit/1690723))
 * feat (metrics): #1595 implement undesired event pings for loader and missing image ([8f97a5f](https://github.com/mozilla/activity-stream/commit/8f97a5f))
+* feat (metrics): #1782 ping event when slow addon detected ([2988d54](https://github.com/mozilla/activity-stream/commit/2988d54))
+* feat (metrics): #2063 Track `screenshot` image type in event telemetry ([09f50ea](https://github.com/mozilla/activity-stream/commit/09f50ea))
 * feat(experiment) - Turn highlights experiment on via ExperimentOverride ([6433043](https://github.com/mozilla/activity-stream/commit/6433043))
 * feat(highlights) - Create weighted highlights experiment ([bc4a9dc](https://github.com/mozilla/activity-stream/commit/bc4a9dc))
 * feat(metadata) Closes #1410 Create a metadata parser ([121aa50](https://github.com/mozilla/activity-stream/commit/121aa50)), closes [#1410](https://github.com/mozilla/activity-stream/issues/1410)
@@ -31,17 +38,29 @@
 * fix (addon): #1711 use OS specific share icon in toolbar ([8c63a61](https://github.com/mozilla/activity-stream/commit/8c63a61)), closes [#1711](https://github.com/mozilla/activity-stream/issues/1711)
 * fix (addon): #1785 refresh HighlightsFeed after a tab sync ([3bf71d8](https://github.com/mozilla/activity-stream/commit/3bf71d8)), closes [#1785](https://github.com/mozilla/activity-stream/issues/1785)
 * fix (addon): #1867 fix ExperimentProvider exception on unload ([5645f75](https://github.com/mozilla/activity-stream/commit/5645f75)), closes [#1867](https://github.com/mozilla/activity-stream/issues/1867)
+* fix (addon): #2081 use asyncGetTopNewTabSites in screenshots experiment ([a21179b](https://github.com/mozilla/activity-stream/commit/a21179b)), closes [#2081](https://github.com/mozilla/activity-stream/issues/2081)
+* fix (addon): fixes for getScreenshots ([e770db1](https://github.com/mozilla/activity-stream/commit/e770db1))
 * fix (addon): Remove timline paths from app urls ([a5f9a80](https://github.com/mozilla/activity-stream/commit/a5f9a80))
 * fix (content): #1372 stopPropagation of LinkMenuButton click (#1447) ([e1e9f00](https://github.com/mozilla/activity-stream/commit/e1e9f00)), closes [#1372](https://github.com/mozilla/activity-stream/issues/1372) [#1447](https://github.com/mozilla/activity-stream/issues/1447)
 * fix (content): #1547 fix top sites context menu button css ([853351a](https://github.com/mozilla/activity-stream/commit/853351a)), closes [#1547](https://github.com/mozilla/activity-stream/issues/1547)
 * fix (content): #1605 fix hint z-index issue ([48eb118](https://github.com/mozilla/activity-stream/commit/48eb118)), closes [#1605](https://github.com/mozilla/activity-stream/issues/1605)
 * fix (content): #1763 fix context menu button clicking ([984cdee](https://github.com/mozilla/activity-stream/commit/984cdee)), closes [#1763](https://github.com/mozilla/activity-stream/issues/1763)
+* fix (content): #2043 hide spotlight favicon in top sites experiment ([df79532](https://github.com/mozilla/activity-stream/commit/df79532)), closes [#2043](https://github.com/mozilla/activity-stream/issues/2043)
+* fix (content): #2071 fix site title overflow in top sites experiment ([f93670c](https://github.com/mozilla/activity-stream/commit/f93670c)), closes [#2071](https://github.com/mozilla/activity-stream/issues/2071)
+* fix (content): #2083 make large favicons fill the tile ([8683703](https://github.com/mozilla/activity-stream/commit/8683703)), closes [#2083](https://github.com/mozilla/activity-stream/issues/2083)
+* fix (content): #2084 center screenshot on top sites ([a8eec34](https://github.com/mozilla/activity-stream/commit/a8eec34)), closes [#2084](https://github.com/mozilla/activity-stream/issues/2084)
+* fix (content): add system fonts for Windows and Ubuntu ([965a36a](https://github.com/mozilla/activity-stream/commit/965a36a))
+* fix (content): Implement new gutter size ([84b1109](https://github.com/mozilla/activity-stream/commit/84b1109))
 * fix (debug): #1875 Fix debug page ([1f616c5](https://github.com/mozilla/activity-stream/commit/1f616c5)), closes [#1875](https://github.com/mozilla/activity-stream/issues/1875)
+* fix (experiments): disable screenshots experiment in release branch ([d9ac32b](https://github.com/mozilla/activity-stream/commit/d9ac32b))
 * fix (metadatastore): parameterize the images SELECT query ([a4afd6c](https://github.com/mozilla/activity-stream/commit/a4afd6c))
+* fix (style): #2095 css fixes for narrow windows ([173f0a0](https://github.com/mozilla/activity-stream/commit/173f0a0)), closes [#2095](https://github.com/mozilla/activity-stream/issues/2095)
 * Fix travisci.yaml ([a747abc](https://github.com/mozilla/activity-stream/commit/a747abc))
 * fix(content) #1816 Use label instead of provider_name for spotlight ([c751114](https://github.com/mozilla/activity-stream/commit/c751114))
+* fix(content) #1916 Dedupe against defaults in selectAndDedupe ([5e4218e](https://github.com/mozilla/activity-stream/commit/5e4218e))
 * fix(tests) Closes #1196 Intermittent SearchProvider failure ([9275737](https://github.com/mozilla/activity-stream/commit/9275737)), closes [#1196](https://github.com/mozilla/activity-stream/issues/1196)
 * lint (metadatastore): fix some lint issues ([7b74361](https://github.com/mozilla/activity-stream/commit/7b74361))
+* linting fixes ([0c93fb7](https://github.com/mozilla/activity-stream/commit/0c93fb7))
 * remove (content): #1503 remove react-router ([fd2a88a](https://github.com/mozilla/activity-stream/commit/fd2a88a))
 * remove (content): remove Header component ([8ca0007](https://github.com/mozilla/activity-stream/commit/8ca0007))
 * remove no longer used recommended logic ([ee8feaf](https://github.com/mozilla/activity-stream/commit/ee8feaf))
@@ -52,18 +71,18 @@
 * review feedback tweaks ([341f2c4](https://github.com/mozilla/activity-stream/commit/341f2c4))
 * Review feedback tweaks v2 ([170b2a7](https://github.com/mozilla/activity-stream/commit/170b2a7))
 * Review fixup ([404611e](https://github.com/mozilla/activity-stream/commit/404611e))
-* Update travis script for v1.2.0 ([75135eb](https://github.com/mozilla/activity-stream/commit/75135eb))
+* Update travis script for v1.3.0 ([48f79f4](https://github.com/mozilla/activity-stream/commit/48f79f4))
 * v1.1.4 changelog ([0a91220](https://github.com/mozilla/activity-stream/commit/0a91220))
-* metrics(metadata): Closes #1432 Add metrics to local metadata parsing ([cdac9b5](https://github.com/mozilla/activity-stream/commit/cdac9b5)), closes [#1432](https://github.com/mozilla/activity-stream/issues/1432)
-* metrics(metadata): Closes #1897 Track metadata coverage for sites ([0ed91c3](https://github.com/mozilla/activity-stream/commit/0ed91c3)), closes [#1897](https://github.com/mozilla/activity-stream/issues/1897)
-* metrics(metadata): Fixes #1713 Send correct value for perf ping ([f617eb6](https://github.com/mozilla/activity-stream/commit/f617eb6)), closes [#1713](https://github.com/mozilla/activity-stream/issues/1713)
 * feat(addon): #1452 Add 'Feeds' to allow for custom update cycles ([94d350b](https://github.com/mozilla/activity-stream/commit/94d350b))
 * feat(addon): #1512 Add lodash.debounce and timers to vendor-src ([2d747e7](https://github.com/mozilla/activity-stream/commit/2d747e7))
+* feat(addon): #2045 Add support for screenshots ([413d7bc](https://github.com/mozilla/activity-stream/commit/413d7bc))
+* feat(addon): #2045 Add UI to support screenshots ([bfe614a](https://github.com/mozilla/activity-stream/commit/bfe614a))
 * feat(benchmark): #1236 add baseline benchmarks ([4981e9b](https://github.com/mozilla/activity-stream/commit/4981e9b))
 * feat(content): #1537 Onboarding tooltip for top sites/highlights ([ad665a9](https://github.com/mozilla/activity-stream/commit/ad665a9))
 * feat(content): #1906 Add Snippet component ([494777d](https://github.com/mozilla/activity-stream/commit/494777d))
 * feat(experiments): Add display for experiments to debug (#1728) ([a4fb50a](https://github.com/mozilla/activity-stream/commit/a4fb50a))
 * feat(experiments): Closes #1431 Set up local metadata parser as experiment ([bc368b3](https://github.com/mozilla/activity-stream/commit/bc368b3)), closes [#1431](https://github.com/mozilla/activity-stream/issues/1431)
+* feat(experiments): Closes #1952 Use orig tiles algorithm for top sites ([2dfed53](https://github.com/mozilla/activity-stream/commit/2dfed53)), closes [#1952](https://github.com/mozilla/activity-stream/issues/1952)
 * feat(feeds): #1452 Remove History, Old Highlights Feeds ([50c058d](https://github.com/mozilla/activity-stream/commit/50c058d))
 * feat(feeds): #1681 Add PlacesStatsFeed for history, bookmarks size ([a78c055](https://github.com/mozilla/activity-stream/commit/a78c055))
 * feat(feeds): #1750 PageModProvider, add broadcasting/send to feeds ([7575cd7](https://github.com/mozilla/activity-stream/commit/7575cd7))
@@ -76,74 +95,14 @@
 * feat(metadata): Closes #1417 Add a framescript for local metadata parsing ([c1f1c5c](https://github.com/mozilla/activity-stream/commit/c1f1c5c)), closes [#1417](https://github.com/mozilla/activity-stream/issues/1417)
 * feat(metadata): Closes #1430 Init PageScraper and pref it off ([1ac6370](https://github.com/mozilla/activity-stream/commit/1ac6370)), closes [#1430](https://github.com/mozilla/activity-stream/issues/1430)
 * feat(metadata): Closes #1588 add provider_name to metadata ([c9f498b](https://github.com/mozilla/activity-stream/commit/c9f498b)), closes [#1588](https://github.com/mozilla/activity-stream/issues/1588)
+* feat(metadata): Closes #1685 Fetch page content locally ([fc4e40f](https://github.com/mozilla/activity-stream/commit/fc4e40f)), closes [#1685](https://github.com/mozilla/activity-stream/issues/1685)
+* feat(metadata): Closes #2044 compute and store favicon sizes ([c9f5c25](https://github.com/mozilla/activity-stream/commit/c9f5c25)), closes [#2044](https://github.com/mozilla/activity-stream/issues/2044)
 * feat(metadata): Compute image size locally (#1644) ([51264fa](https://github.com/mozilla/activity-stream/commit/51264fa))
+* feat(metrics): Closes #1961 Capture telemetry for clearing history ([c33773a](https://github.com/mozilla/activity-stream/commit/c33773a)), closes [#1961](https://github.com/mozilla/activity-stream/issues/1961)
 * feat(NewTab): (closes #1675) show placeholder content when "waiting" dialog up ([ccb4a48](https://github.com/mozilla/activity-stream/commit/ccb4a48)), closes [#1675](https://github.com/mozilla/activity-stream/issues/1675)
 * feat(places): Fixes #1901 Refresh after clearing history ([9cd3279](https://github.com/mozilla/activity-stream/commit/9cd3279)), closes [#1901](https://github.com/mozilla/activity-stream/issues/1901)
 * feat(timeline): Improve filtering with word boundary and smart-case-sensitive matches (#1350) ([22806ca](https://github.com/mozilla/activity-stream/commit/22806ca))
 * feat(topsites): Show shorter top sites label without top level domain ([66576d7](https://github.com/mozilla/activity-stream/commit/66576d7))
-* experiments(metadata): Closes #1361 Turn metadataService experiment on ([4014f27](https://github.com/mozilla/activity-stream/commit/4014f27)), closes [#1361](https://github.com/mozilla/activity-stream/issues/1361)
-* experiments(topsites): Compare uncombined/combined frecency scores of deduped top sites (#1928) ([0f434c5](https://github.com/mozilla/activity-stream/commit/0f434c5))
-* fix(addon): #1451 - Add exception handling for insert failures ([4ab2c85](https://github.com/mozilla/activity-stream/commit/4ab2c85))
-* fix(addon): #1600 replace sdk/url with url-parse (#1601) ([2717fb9](https://github.com/mozilla/activity-stream/commit/2717fb9))
-* fix(addon): #1756 - fix a race condition in TabTracker ([91a269a](https://github.com/mozilla/activity-stream/commit/91a269a))
-* fix(addon): #1877 Attach number of highlights in session ping ([492c171](https://github.com/mozilla/activity-stream/commit/492c171))
-* fix(addon): Closes #1480 Create an init function for ActivityStreams ([73b58f6](https://github.com/mozilla/activity-stream/commit/73b58f6)), closes [#1480](https://github.com/mozilla/activity-stream/issues/1480)
-* fix(addon): Differentiate homepage-loaded activity stream for pings (#1804) ([15b1634](https://github.com/mozilla/activity-stream/commit/15b1634))
-* fix(addon): Remove the frame-src definition as it is now obsolete. ([3c82075](https://github.com/mozilla/activity-stream/commit/3c82075))
-* fix(addon): Split adding to metadataDB (#1419) ([f652887](https://github.com/mozilla/activity-stream/commit/f652887))
-* fix(bookmarks): Fixes #1551 Bookmarks is busted ([025b175](https://github.com/mozilla/activity-stream/commit/025b175)), closes [#1551](https://github.com/mozilla/activity-stream/issues/1551)
-* fix(ci): Fix TravisCI.yaml ([5046d12](https://github.com/mozilla/activity-stream/commit/5046d12))
-* fix(coloranalyzer): Fix #1842 Color Analyzer throwing ([7d06c8d](https://github.com/mozilla/activity-stream/commit/7d06c8d)), closes [#1842](https://github.com/mozilla/activity-stream/issues/1842)
-* fix(coloranalyzer): Fixes #1920 Resolve on null color for ColorAnalyzer ([18c2f98](https://github.com/mozilla/activity-stream/commit/18c2f98)), closes [#1920](https://github.com/mozilla/activity-stream/issues/1920)
-* fix(content): Detect stabilization of state to reload from "Hang on tight" (#1636) ([70432bb](https://github.com/mozilla/activity-stream/commit/70432bb))
-* fix(crash): Fixes #1567 AS crashes on force shutdown ([e644b23](https://github.com/mozilla/activity-stream/commit/e644b23)), closes [#1567](https://github.com/mozilla/activity-stream/issues/1567)
-* fix(debug): #1738 Restore Highlights to UI tester ([252fb1f](https://github.com/mozilla/activity-stream/commit/252fb1f))
-* fix(exceptions): Fixes #1667 add .catch to promises ([89b201d](https://github.com/mozilla/activity-stream/commit/89b201d)), closes [#1667](https://github.com/mozilla/activity-stream/issues/1667)
-* fix(experiments): #1680 Trigger action for experiment changes ([0d7e7f0](https://github.com/mozilla/activity-stream/commit/0d7e7f0))
-* fix(framescript): Don't wait for load before sending metadata ([5fb4282](https://github.com/mozilla/activity-stream/commit/5fb4282))
-* fix(highlights): Fix vertical text cropping & layout in individual items (#1546) ([1ba0b8d](https://github.com/mozilla/activity-stream/commit/1ba0b8d)), closes [#1546](https://github.com/mozilla/activity-stream/issues/1546)
-* fix(highlights): Fixes #1553 Limit highlights to one item per domain ([ec7610b](https://github.com/mozilla/activity-stream/commit/ec7610b)), closes [#1553](https://github.com/mozilla/activity-stream/issues/1553)
-* fix(highlights): Fixes #1635 Filter out highlights with no images ([8a015c8](https://github.com/mozilla/activity-stream/commit/8a015c8)), closes [#1635](https://github.com/mozilla/activity-stream/issues/1635)
-* fix(highlights): Fixes #1917 No highlights on re-install ([7641f66](https://github.com/mozilla/activity-stream/commit/7641f66)), closes [#1917](https://github.com/mozilla/activity-stream/issues/1917)
-* fix(highlights): Heavily boost recent bookmarks and not much from 3 days or older (#1888) ([f7c96cd](https://github.com/mozilla/activity-stream/commit/f7c96cd))
-* fix(highlights): Remove first-run default highlights and related packaged images (#1871) ([c15d9f4](https://github.com/mozilla/activity-stream/commit/c15d9f4))
-* fix(highlights): Use a single recent query with a limit of 500 (#1870) ([f5a30fc](https://github.com/mozilla/activity-stream/commit/f5a30fc))
-* fix(highlights): Use the same limit for bookmarks as history and let weighter decide (#1603) ([f256d3e](https://github.com/mozilla/activity-stream/commit/f256d3e))
-* fix(highlights): Wait for async initializers before loading app data (#1538) ([b30fdf7](https://github.com/mozilla/activity-stream/commit/b30fdf7))
-* fix(metadata): Consolidate the use of provider fields (#1592) ([8830040](https://github.com/mozilla/activity-stream/commit/8830040))
-* fix(metadata): Fixes #1822 Enable data expiry job ([3ebf603](https://github.com/mozilla/activity-stream/commit/3ebf603)), closes [#1822](https://github.com/mozilla/activity-stream/issues/1822)
-* fix(metadata): Fixes 1658 Consolidate favicon fields ([dc49d20](https://github.com/mozilla/activity-stream/commit/dc49d20))
-* fix(metadatastore): #1577: Add parameterized query ([1bdd429](https://github.com/mozilla/activity-stream/commit/1bdd429))
-* fix(metrics): Add a source for performance pings ([bbfc687](https://github.com/mozilla/activity-stream/commit/bbfc687))
-* fix(metrics): Fixes #1630 Add value to metadataReceivedRawHTML ping ([7a8dcd7](https://github.com/mozilla/activity-stream/commit/7a8dcd7)), closes [#1630](https://github.com/mozilla/activity-stream/issues/1630)
-* fix(newtab): Show a border between top site icon/title and highlight picture/details (#1893) ([f02327e](https://github.com/mozilla/activity-stream/commit/f02327e))
-* fix(package): Revert dependencies update causing build failures (#1689) ([48e36b2](https://github.com/mozilla/activity-stream/commit/48e36b2)), closes [#1688](https://github.com/mozilla/activity-stream/issues/1688)
-* fix(page-worker): #1512 Debounce page-worker listener ([6fa1f6a](https://github.com/mozilla/activity-stream/commit/6fa1f6a))
-* fix(pagescraper): Fix #1859 PageScraper unhandled exception ([5ff0919](https://github.com/mozilla/activity-stream/commit/5ff0919)), closes [#1859](https://github.com/mozilla/activity-stream/issues/1859)
-* fix(rating): Closes #1475 Remove rating system ([f8a2b61](https://github.com/mozilla/activity-stream/commit/f8a2b61)), closes [#1475](https://github.com/mozilla/activity-stream/issues/1475)
-* fix(recommender): Remove recent filtering logic relying on faulty SCROLL_THRESHOLD usage (#1800) ([7104493](https://github.com/mozilla/activity-stream/commit/7104493))
-* fix(reporting): fix #1831 Missing TOP_SITES pings ([8856daa](https://github.com/mozilla/activity-stream/commit/8856daa)), closes [#1831](https://github.com/mozilla/activity-stream/issues/1831)
-* fix(search): Listen to browser.search.hiddenOneOffs (#1797) ([7a345fe](https://github.com/mozilla/activity-stream/commit/7a345fe))
-* fix(sqlite): Fixes #1768 Limit MetadataStore SQLite parameters ([4ff858e](https://github.com/mozilla/activity-stream/commit/4ff858e)), closes [#1768](https://github.com/mozilla/activity-stream/issues/1768)
-* fix(storybook): fix storybook Highlight regression ([53660a3](https://github.com/mozilla/activity-stream/commit/53660a3))
-* fix(storybook): get storybook to pick up CSS changes ([865dfc2](https://github.com/mozilla/activity-stream/commit/865dfc2))
-* fix(tabtracker): Revert default values to tabTracker (#1629) ([f991f5a](https://github.com/mozilla/activity-stream/commit/f991f5a))
-* fix(telemetry): #1828 - Track the addon's pref change ([277e203](https://github.com/mozilla/activity-stream/commit/277e203))
-* fix(test): #1407 - Fix a race condition in places caching unit test ([509f8e7](https://github.com/mozilla/activity-stream/commit/509f8e7))
-* fix(test): #1442 - fix a test failure in MetadataStore.js ([b39ef74](https://github.com/mozilla/activity-stream/commit/b39ef74))
-* fix(test): Potentially fix intermittent weightedHighlights test failure ([b70a35b](https://github.com/mozilla/activity-stream/commit/b70a35b))
-* fix(tests): #1823 Only run tests after before in content-test/index.js ([a053f82](https://github.com/mozilla/activity-stream/commit/a053f82))
-* fix(tests): Fixes #1197 Intermittent RecommendationProvider failure ([eb6597c](https://github.com/mozilla/activity-stream/commit/eb6597c)), closes [#1197](https://github.com/mozilla/activity-stream/issues/1197)
-* fix(tests): Fixes #1557 mock PageWorker to remove null warning ([89880b7](https://github.com/mozilla/activity-stream/commit/89880b7)), closes [#1557](https://github.com/mozilla/activity-stream/issues/1557)
-* fix(timeline): Filter links with SQL and only show filter-compatible results (#1346) ([85a2d5f](https://github.com/mozilla/activity-stream/commit/85a2d5f))
-* fix(topsites): Combine frecency of deduped pages (#1883) ([5a7a384](https://github.com/mozilla/activity-stream/commit/5a7a384))
-* fix(topsites): Dedupe www. sites with non-www. sites (#1392) ([80cc5e3](https://github.com/mozilla/activity-stream/commit/80cc5e3))
-* metadata(experiment): Closes #1813 Graduate local metadata experiment ([1890042](https://github.com/mozilla/activity-stream/commit/1890042)), closes [#1813](https://github.com/mozilla/activity-stream/issues/1813)
-* metadata(feeds): Closes #1826 Create a MetadataFeed ([107f079](https://github.com/mozilla/activity-stream/commit/107f079)), closes [#1826](https://github.com/mozilla/activity-stream/issues/1826)
-* tests(metadata): Closes #1467 Integration test for framescript ([ffb0a3f](https://github.com/mozilla/activity-stream/commit/ffb0a3f)), closes [#1467](https://github.com/mozilla/activity-stream/issues/1467)
-* tests(shims): #1375 General override globals ([ae7c779](https://github.com/mozilla/activity-stream/commit/ae7c779))
-* tests(shims): #1375 Task global for test shims ([903b18f](https://github.com/mozilla/activity-stream/commit/903b18f))
-* tests(topsites): Add action tests for TOP_SITES click ([0b8e11c](https://github.com/mozilla/activity-stream/commit/0b8e11c))
 * chore(actions): Remove unused experiment actions ([7198a54](https://github.com/mozilla/activity-stream/commit/7198a54))
 * chore(addon): #1509 - Host the add-on release channel via Test Pilot ([454f581](https://github.com/mozilla/activity-stream/commit/454f581))
 * chore(addon): #1583 - Remove the recommendation module ([cb0dce5](https://github.com/mozilla/activity-stream/commit/cb0dce5))
@@ -175,7 +134,7 @@
 * chore(doc): Fix the telemetry documents ([be25f2f](https://github.com/mozilla/activity-stream/commit/be25f2f))
 * chore(doc): tweak docs for benchmark_how_to ([de4f8e2](https://github.com/mozilla/activity-stream/commit/de4f8e2))
 * chore(doc): update README.md for benchmarking ([df8037d](https://github.com/mozilla/activity-stream/commit/df8037d))
-* chore(exp): Re-balance the experiment groups ([35d3511](https://github.com/mozilla/activity-stream/commit/35d3511))
+* chore(exp): Re-balance the experiment groups ([082faf7](https://github.com/mozilla/activity-stream/commit/082faf7))
 * chore(feeds): #1681 Remove Memoizer, asyncBuildPlacescache ([0f89b28](https://github.com/mozilla/activity-stream/commit/0f89b28))
 * chore(feeds): #1829 Refactor respondToSearchRequests into SearchFeed ([111883d](https://github.com/mozilla/activity-stream/commit/111883d))
 * chore(files): #1817 audit .jpmignore ([c61070a](https://github.com/mozilla/activity-stream/commit/c61070a))
@@ -227,6 +186,7 @@
 * chore(package): update webpack to version 1.13.3 #1637 ([87f0145](https://github.com/mozilla/activity-stream/commit/87f0145))
 * chore(performance): Only set state if differences were found ([acf3a5a](https://github.com/mozilla/activity-stream/commit/acf3a5a))
 * chore(prefs): #1745 Remove weightedHighlights exp from dev-prefs ([5dd47b1](https://github.com/mozilla/activity-stream/commit/5dd47b1))
+* chore(prefs): Remove duplicate pref logic (#1955) ([6faba02](https://github.com/mozilla/activity-stream/commit/6faba02))
 * chore(react): Remove 'ActivityFeed' and related components (#1742) ([c9286d8](https://github.com/mozilla/activity-stream/commit/c9286d8))
 * chore(reducers): #1452 Remove History.init from isReady selector ([c908f08](https://github.com/mozilla/activity-stream/commit/c908f08))
 * chore(reducers): Fixes #1740 Remove 'History' reducer ([4dc7383](https://github.com/mozilla/activity-stream/commit/4dc7383)), closes [#1740](https://github.com/mozilla/activity-stream/issues/1740)
@@ -237,8 +197,94 @@
 * chore(selectors): #1783 Move selectors to common/ ([6ebb2db](https://github.com/mozilla/activity-stream/commit/6ebb2db))
 * chore(selectors): closes #1798; unifies and tests areSelectorsReady ([ff572ac](https://github.com/mozilla/activity-stream/commit/ff572ac)), closes [#1798](https://github.com/mozilla/activity-stream/issues/1798)
 * chore(storybook): support auto-building of storybooks for PR commits by storybook.io (#1422) ([02c5e44](https://github.com/mozilla/activity-stream/commit/02c5e44))
+* chore(testing): #1929 Add Enzyme and some stateless functional components ([3e206a7](https://github.com/mozilla/activity-stream/commit/3e206a7))
+* chore(testing): #1929 Convert Snippet.test.js to use Enzyme ([43bb24e](https://github.com/mozilla/activity-stream/commit/43bb24e))
+* chore(testing): #1929 Move HighlightContext to a function component ([e1028f0](https://github.com/mozilla/activity-stream/commit/e1028f0))
+* chore(testing): #1929 Switch Snippet to be a stateless functional component ([e84e9d3](https://github.com/mozilla/activity-stream/commit/e84e9d3))
 * chore(webpack): #1848 Remove addon-only deps from content webpack ([1917fda](https://github.com/mozilla/activity-stream/commit/1917fda))
 * chore(webpack): #1849 Remove moment.js from bundle ([910f4ee](https://github.com/mozilla/activity-stream/commit/910f4ee))
+* metrics(metadata): Closes #1432 Add metrics to local metadata parsing ([cdac9b5](https://github.com/mozilla/activity-stream/commit/cdac9b5)), closes [#1432](https://github.com/mozilla/activity-stream/issues/1432)
+* metrics(metadata): Closes #1897 Track metadata coverage for sites ([0ed91c3](https://github.com/mozilla/activity-stream/commit/0ed91c3)), closes [#1897](https://github.com/mozilla/activity-stream/issues/1897)
+* metrics(metadata): Fixes #1713 Send correct value for perf ping ([f617eb6](https://github.com/mozilla/activity-stream/commit/f617eb6)), closes [#1713](https://github.com/mozilla/activity-stream/issues/1713)
+* experiments(metadata): Closes #1361 Turn metadataService experiment on ([4014f27](https://github.com/mozilla/activity-stream/commit/4014f27)), closes [#1361](https://github.com/mozilla/activity-stream/issues/1361)
+* experiments(topsites): Compare uncombined/combined frecency scores of deduped top sites (#1928) ([0f434c5](https://github.com/mozilla/activity-stream/commit/0f434c5))
+* metadata(experiment): Closes #1813 Graduate local metadata experiment ([1890042](https://github.com/mozilla/activity-stream/commit/1890042)), closes [#1813](https://github.com/mozilla/activity-stream/issues/1813)
+* metadata(feeds): Closes #1826 Create a MetadataFeed ([107f079](https://github.com/mozilla/activity-stream/commit/107f079)), closes [#1826](https://github.com/mozilla/activity-stream/issues/1826)
+* tests(metadata): Closes #1467 Integration test for framescript ([ffb0a3f](https://github.com/mozilla/activity-stream/commit/ffb0a3f)), closes [#1467](https://github.com/mozilla/activity-stream/issues/1467)
+* tests(shims): #1375 General override globals ([ae7c779](https://github.com/mozilla/activity-stream/commit/ae7c779))
+* tests(shims): #1375 Task global for test shims ([903b18f](https://github.com/mozilla/activity-stream/commit/903b18f))
+* tests(topsites): Add action tests for TOP_SITES click ([0b8e11c](https://github.com/mozilla/activity-stream/commit/0b8e11c))
+* fix(addon): #1451 - Add exception handling for insert failures ([4ab2c85](https://github.com/mozilla/activity-stream/commit/4ab2c85))
+* fix(addon): #1600 replace sdk/url with url-parse (#1601) ([2717fb9](https://github.com/mozilla/activity-stream/commit/2717fb9))
+* fix(addon): #1756 - fix a race condition in TabTracker ([91a269a](https://github.com/mozilla/activity-stream/commit/91a269a))
+* fix(addon): #1877 Attach number of highlights in session ping ([492c171](https://github.com/mozilla/activity-stream/commit/492c171))
+* fix(addon): Closes #1480 Create an init function for ActivityStreams ([73b58f6](https://github.com/mozilla/activity-stream/commit/73b58f6)), closes [#1480](https://github.com/mozilla/activity-stream/issues/1480)
+* fix(addon): Differentiate homepage-loaded activity stream for pings (#1804) ([15b1634](https://github.com/mozilla/activity-stream/commit/15b1634))
+* fix(addon): Filter blocked urls from NewTab links ([a96273d](https://github.com/mozilla/activity-stream/commit/a96273d))
+* fix(addon): Remove the frame-src definition as it is now obsolete. ([3c82075](https://github.com/mozilla/activity-stream/commit/3c82075))
+* fix(addon): Split adding to metadataDB (#1419) ([f652887](https://github.com/mozilla/activity-stream/commit/f652887))
+* fix(bookmarks): Fixes #1551 Bookmarks is busted ([025b175](https://github.com/mozilla/activity-stream/commit/025b175)), closes [#1551](https://github.com/mozilla/activity-stream/issues/1551)
+* fix(bookmarks): Fixes #1957 Remove bookmark option unavailable ([66076b8](https://github.com/mozilla/activity-stream/commit/66076b8)), closes [#1957](https://github.com/mozilla/activity-stream/issues/1957)
+* fix(ci): Fix TravisCI.yaml ([5046d12](https://github.com/mozilla/activity-stream/commit/5046d12))
+* fix(coloranalyzer): Fix #1842 Color Analyzer throwing ([7d06c8d](https://github.com/mozilla/activity-stream/commit/7d06c8d)), closes [#1842](https://github.com/mozilla/activity-stream/issues/1842)
+* fix(coloranalyzer): Fixes #1920 Resolve on null color for ColorAnalyzer ([18c2f98](https://github.com/mozilla/activity-stream/commit/18c2f98)), closes [#1920](https://github.com/mozilla/activity-stream/issues/1920)
+* fix(content): #2079 Remove vertical padding on search input ([03dc30d](https://github.com/mozilla/activity-stream/commit/03dc30d))
+* fix(content): Bumped tippy-top-sites for better icons ([37fb4c3](https://github.com/mozilla/activity-stream/commit/37fb4c3))
+* fix(content): Detect stabilization of state to reload from "Hang on tight" (#1636) ([70432bb](https://github.com/mozilla/activity-stream/commit/70432bb))
+* fix(content): Remove comment for unused arg in selectAndDedupe ([7dae034](https://github.com/mozilla/activity-stream/commit/7dae034))
+* fix(crash): Fixes #1567 AS crashes on force shutdown ([e644b23](https://github.com/mozilla/activity-stream/commit/e644b23)), closes [#1567](https://github.com/mozilla/activity-stream/issues/1567)
+* fix(debug): #1738 Restore Highlights to UI tester ([252fb1f](https://github.com/mozilla/activity-stream/commit/252fb1f))
+* fix(exceptions): Fixes #1667 add .catch to promises ([89b201d](https://github.com/mozilla/activity-stream/commit/89b201d)), closes [#1667](https://github.com/mozilla/activity-stream/issues/1667)
+* fix(experiment): Fix top sites experiment favicons ([f0591e7](https://github.com/mozilla/activity-stream/commit/f0591e7))
+* fix(experiments): #1680 Trigger action for experiment changes ([0d7e7f0](https://github.com/mozilla/activity-stream/commit/0d7e7f0))
+* fix(framescript): Don't wait for load before sending metadata ([5fb4282](https://github.com/mozilla/activity-stream/commit/5fb4282))
+* fix(highlights): Fix vertical text cropping & layout in individual items (#1546) ([1ba0b8d](https://github.com/mozilla/activity-stream/commit/1ba0b8d)), closes [#1546](https://github.com/mozilla/activity-stream/issues/1546)
+* fix(highlights): Fixes #1553 Limit highlights to one item per domain ([ec7610b](https://github.com/mozilla/activity-stream/commit/ec7610b)), closes [#1553](https://github.com/mozilla/activity-stream/issues/1553)
+* fix(highlights): Fixes #1635 Filter out highlights with no images ([8a015c8](https://github.com/mozilla/activity-stream/commit/8a015c8)), closes [#1635](https://github.com/mozilla/activity-stream/issues/1635)
+* fix(highlights): Fixes #1917 No highlights on re-install ([7641f66](https://github.com/mozilla/activity-stream/commit/7641f66)), closes [#1917](https://github.com/mozilla/activity-stream/issues/1917)
+* fix(highlights): Fixes #1932 Cap the retry logic for HIGHLIGHTS_AWAITING_METADATA ([32e30cd](https://github.com/mozilla/activity-stream/commit/32e30cd)), closes [#1932](https://github.com/mozilla/activity-stream/issues/1932)
+* fix(highlights): Heavily boost recent bookmarks and not much from 3 days or older (#1888) ([f7c96cd](https://github.com/mozilla/activity-stream/commit/f7c96cd))
+* fix(highlights): Remove first-run default highlights and related packaged images (#1871) ([c15d9f4](https://github.com/mozilla/activity-stream/commit/c15d9f4))
+* fix(highlights): Use a single recent query with a limit of 500 (#1870) ([f5a30fc](https://github.com/mozilla/activity-stream/commit/f5a30fc))
+* fix(highlights): Use the same limit for bookmarks as history and let weighter decide (#1603) ([f256d3e](https://github.com/mozilla/activity-stream/commit/f256d3e))
+* fix(highlights): Wait for async initializers before loading app data (#1538) ([b30fdf7](https://github.com/mozilla/activity-stream/commit/b30fdf7))
+* fix(metadata): Consolidate the use of provider fields (#1592) ([8830040](https://github.com/mozilla/activity-stream/commit/8830040))
+* fix(metadata): Fixes #1822 Enable data expiry job ([3ebf603](https://github.com/mozilla/activity-stream/commit/3ebf603)), closes [#1822](https://github.com/mozilla/activity-stream/issues/1822)
+* fix(metadata): Fixes 1658 Consolidate favicon fields ([dc49d20](https://github.com/mozilla/activity-stream/commit/dc49d20))
+* fix(metadatastore): #1577: Add parameterized query ([1bdd429](https://github.com/mozilla/activity-stream/commit/1bdd429))
+* fix(metrics): Add a source for performance pings ([bbfc687](https://github.com/mozilla/activity-stream/commit/bbfc687))
+* fix(metrics): Fixes #1630 Add value to metadataReceivedRawHTML ping ([7a8dcd7](https://github.com/mozilla/activity-stream/commit/7a8dcd7)), closes [#1630](https://github.com/mozilla/activity-stream/issues/1630)
+* fix(newtab): Show a border between top site icon/title and highlight picture/details (#1893) ([f02327e](https://github.com/mozilla/activity-stream/commit/f02327e))
+* fix(package): Revert dependencies update causing build failures (#1689) ([48e36b2](https://github.com/mozilla/activity-stream/commit/48e36b2)), closes [#1688](https://github.com/mozilla/activity-stream/issues/1688)
+* fix(page-worker): #1512 Debounce page-worker listener ([6fa1f6a](https://github.com/mozilla/activity-stream/commit/6fa1f6a))
+* fix(pagescraper): Fix #1859 PageScraper unhandled exception ([5ff0919](https://github.com/mozilla/activity-stream/commit/5ff0919)), closes [#1859](https://github.com/mozilla/activity-stream/issues/1859)
+* fix(pageScraper): Fixes #1947 Handle image load failures ([ff85a99](https://github.com/mozilla/activity-stream/commit/ff85a99)), closes [#1947](https://github.com/mozilla/activity-stream/issues/1947)
+* fix(places): Ignore expected control flow exception for bad URIs (#1943) ([0f7fb26](https://github.com/mozilla/activity-stream/commit/0f7fb26))
+* fix(rating): Closes #1475 Remove rating system ([f8a2b61](https://github.com/mozilla/activity-stream/commit/f8a2b61)), closes [#1475](https://github.com/mozilla/activity-stream/issues/1475)
+* fix(recommender): Remove recent filtering logic relying on faulty SCROLL_THRESHOLD usage (#1800) ([7104493](https://github.com/mozilla/activity-stream/commit/7104493))
+* fix(reporting): fix #1831 Missing TOP_SITES pings ([8856daa](https://github.com/mozilla/activity-stream/commit/8856daa)), closes [#1831](https://github.com/mozilla/activity-stream/issues/1831)
+* fix(search): Fixes #1900 Search suggestions not being displayed ([37051a1](https://github.com/mozilla/activity-stream/commit/37051a1)), closes [#1900](https://github.com/mozilla/activity-stream/issues/1900)
+* fix(search): Listen to browser.search.hiddenOneOffs (#1797) ([7a345fe](https://github.com/mozilla/activity-stream/commit/7a345fe))
+* fix(sqlite): Fixes #1768 Limit MetadataStore SQLite parameters ([4ff858e](https://github.com/mozilla/activity-stream/commit/4ff858e)), closes [#1768](https://github.com/mozilla/activity-stream/issues/1768)
+* fix(store): Fixes #1766 Sync user actions to store update ([ff9375e](https://github.com/mozilla/activity-stream/commit/ff9375e)), closes [#1766](https://github.com/mozilla/activity-stream/issues/1766)
+* fix(storybook): fix storybook Highlight regression ([53660a3](https://github.com/mozilla/activity-stream/commit/53660a3))
+* fix(storybook): get storybook to pick up CSS changes ([865dfc2](https://github.com/mozilla/activity-stream/commit/865dfc2))
+* fix(style): #2076 force alignment of top sites titles ([b276820](https://github.com/mozilla/activity-stream/commit/b276820))
+* fix(tabtracker): Revert default values to tabTracker (#1629) ([f991f5a](https://github.com/mozilla/activity-stream/commit/f991f5a))
+* fix(telemetry): #1828 - Track the addon's pref change ([277e203](https://github.com/mozilla/activity-stream/commit/277e203))
+* fix(test): #1407 - Fix a race condition in places caching unit test ([509f8e7](https://github.com/mozilla/activity-stream/commit/509f8e7))
+* fix(test): #1442 - fix a test failure in MetadataStore.js ([b39ef74](https://github.com/mozilla/activity-stream/commit/b39ef74))
+* fix(test): Potentially fix intermittent weightedHighlights test failure ([b70a35b](https://github.com/mozilla/activity-stream/commit/b70a35b))
+* fix(tests): #1823 Only run tests after before in content-test/index.js ([a053f82](https://github.com/mozilla/activity-stream/commit/a053f82))
+* fix(tests): Fixes #1197 Intermittent RecommendationProvider failure ([eb6597c](https://github.com/mozilla/activity-stream/commit/eb6597c)), closes [#1197](https://github.com/mozilla/activity-stream/issues/1197)
+* fix(tests): Fixes #1557 mock PageWorker to remove null warning ([89880b7](https://github.com/mozilla/activity-stream/commit/89880b7)), closes [#1557](https://github.com/mozilla/activity-stream/issues/1557)
+* fix(timeline): Filter links with SQL and only show filter-compatible results (#1346) ([85a2d5f](https://github.com/mozilla/activity-stream/commit/85a2d5f))
+* fix(topsites): Combine frecency of deduped pages (#1883) ([5a7a384](https://github.com/mozilla/activity-stream/commit/5a7a384))
+* fix(topsites): Combine frecency of the top pages of with/without www instead of all pages (#1946) ([b2a3e39](https://github.com/mozilla/activity-stream/commit/b2a3e39))
+* fix(topsites): Dedupe www. sites with non-www. sites (#1392) ([80cc5e3](https://github.com/mozilla/activity-stream/commit/80cc5e3))
+* fix(topsites): Fixes #1154 TopSites tile loses highlight on hover ([d43cc0c](https://github.com/mozilla/activity-stream/commit/d43cc0c)), closes [#1154](https://github.com/mozilla/activity-stream/issues/1154)
+* fix(topsites): Fixes #2073 TopSites icon displayed over search suggestions ([8b433f9](https://github.com/mozilla/activity-stream/commit/8b433f9)), closes [#2073](https://github.com/mozilla/activity-stream/issues/2073)
+* fix(topsites): Limit queried sites closer to visible count (#1941) ([8f38b70](https://github.com/mozilla/activity-stream/commit/8f38b70))
 * logging(exceptions): Closes #1779 Do not report db insertion collisions ([3066f07](https://github.com/mozilla/activity-stream/commit/3066f07)), closes [#1779](https://github.com/mozilla/activity-stream/issues/1779)
 * feature(addon): #1511 persist active experiments in prefs. ([1940dea](https://github.com/mozilla/activity-stream/commit/1940dea))
 * feature(Highlights): add Welcome popup w/spinner ([d388fe1](https://github.com/mozilla/activity-stream/commit/d388fe1))