Bug 997521 - Add prepopulated top sites and history. r=kgrandon
Bug 996662 - Rocketbar tests are intermittently failing r=daleharvey
Revert "Merge pull request #18406 from cctuan/968661-4"

This reverts commit 6b7a10e5d026cf031b2f3fc0fe5f671ea02dd4f9, reversing
changes made to eb97461e75cd44d20967bc410b5653dff031ef5a.
Merge pull request #18461 from KevinGrandon/bug_996662_rocketbar_tests

Bug 996662 - Rocketbar tests are intermittently failing
Merge pull request #18453 from daleharvey/997521-redux

Bug 997521 - Add prepopulated top sites and history. r=kgrandon