Bug 926033: correct searchString persistence for different searches in findbar. r=mikedeboer
Bug 926033: add regression test. r=evilpie
Bug 931990 - [markup view] Context menu disappearing in markup tree during after mutation; r=paul
Bug 902505 - Set a no-op CSS viewport on Metro to prevent clipping subframes improperly. r=jimm
Merge m-c to fx-team.
Bug 934714 - toggle progressbar on startpage attribute, always call browserUI.update in selectedTab setter to reset windowState in time. r=rsilveira

--HG--
extra : rebase_source : 8bcf7c1f2093f344b5146e3fed0874e0c2adf5e0
Bug 936513 - Remove unused general.useragent.enable_overrides pref. r=nchen
Backed out changeset a562387a27bb (bug 902505) for mochitest-mc failures.
Bug 935414 - Limit number of constraint terms in filter query. r=lucasr
Bug 846569 - Don't scroll tabs tray when a tab is closed. r=lucasr
merge fx-team to mozilla-central