Bug 1032324 - about:newtab can't switch search engine if icon/logo/image is not available. r=adw
Bug 1073522 - Better error when front has no actor. r=dcamp
Bug 1071164 - Display magnifying glass for search results in awesomebar (follow-up of bug 1040725). r=Unfocused
merge m-c to fx-team
Backed out changeset c9ef2c9434b5 (bug 1071164)
Bug 1073502 - Restore closed windows even when there are no open windows on startup r=yoric
Bug 1071164 - Display magnifying glass for search results in awesomebar (follow-up of bug 1040725). r=Unfocused
Bug 1070778 - Selecting a moz-action: result then typing more can result in "Search X for moz-action:..." item. r=mak

--HG--
extra : transplant_source : %2C%E3F%B4%B9%A9%3A%AD1s%1C%E3Y%C1S%DC%A1%99%DF%C2
Bug 1067367 - tapping the icon of a second doorhanger reopens the first doorhanger if it was already open, r=Enn.
Backout 262b6ad34702 (bug 1070778) due to bc1 failures. r=backout
Bug 1031298 - Add a histogram for counting unrecoverable sessions. r=yoric
Bug 1044020 - Add the duration of shutdown phases to Telemetry. r=froydnj
Bug 1056035 - Hide the separator if there are no visible items above it. r=Unfocused
Bug 1073588 - Turn on local runtime. r=paul
Bug 1044020 - Remove accidentally-added PHONY file. r=derp
Merge m-c to fx-team
Backed out changeset dade62440f97 (bug 1044020)
Backed out changeset 49b1465d3e5e (bug 1044020) for compilation failures
Bug 731865 - Show blocked popups when clicking 'Allow popups' [r=florian]
Merge fx-team to m-c. a=merge