Bug 961538 - Correctly extract bitmaps from stored icons in search preferences. r=mfinkle
[Australis] Bug 956285: update zoom controls percentage label upon navigation. r=Gijs
[Australis] Bug 956285: test zoom label update on page navigation. r=Gijs
merge fx-team to mozilla-central