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

[Olivier Tilloy]

Review: Needs Fixing

Revision 1066 breaks autopilot tests. Please run the tests locally before pushing new revisions.
-- 
https://code.launchpad.net/~artmello/webbrowser-app/webbrowser-app-bookmark_folders/+merge/260410
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.