Bug 915076 - Fix intermittent orange tests for getAllBookmarks and setAndLoadIconForPage

aus's patch from https://github.com/mozilla-b2g/gaia/pull/12133, rebased