Bug 672474 - followup to use GetExtantDoc(); r=ms2ger
Merge m-c to fx-team.
Bug 834721 - Use plurals for toolbox button tooltip; r=paul f=l10n
merge m-c to fx-team
Bug 829568 - part 1 - don't save (invalid) states without any windows; r=felipe
Bug 829568 - part 2 - back up the initial session when starting up with a private window; r=felipe
Bug 829568 - part 3 - restore the initial session in case the user opens a non-private window; r=felipe
Bug 795939 - Cancel FX_PAGE_LOAD_MS when the request is aborted; r=felipe
Bug 841954 - Make sure onOpen callback fires in all cases, r=past
merge m-c to fx-team