[Merge] lp:~artmello/webbrowser-app/webbrowser-app-bookmarks_top_sites into lp:webbrowser-app

[Olivier Tilloy]

There is a trivial conflict in tests/autopilot/webbrowser_app/emulators/browser.py when merging into the latest trunk, can you please resolve it?
-- 
https://code.launchpad.net/~artmello/webbrowser-app/webbrowser-app-bookmarks_top_sites/+merge/224592
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.