Bug 984140 - UITour: Info panels with no image are missing a left margin.  r=mattn
Bug 1098661 -  Update sync in-content preferences UI to match FxA migration flows. r=adw
Bug 1109430 - Sync migrator module should show confirmation after resending verification email. r=adw
Backed out 2 changesets (bug 1098661, bug 1109430) for leaking prefs windows
CLOSED TREE

Backed out changeset 1b8f23ce8a7a (bug 1109430)
Backed out changeset 069da43ec3be (bug 1098661)
Merge mozilla-central to fx-team
Bug 1105525 - Enlarge Loop room rename field to prevent l10n issues. r=Standard8
(no bug) convert Windows to Unix line-endings in browser_UITour_loop.js. DONTBUILD because formatting only. r=me
Bug 1080948: UITour: tell the page when a URL is copied or emailed. r=MattN,dmose
Bug 1111601 - Avoid using hiddenwindow in DevTools code r=pbrosset
Fix marionette bustage - follow-up of bug 1080948. CLOSED TREE. r=bustage
Bug 1110607 - Enable tab mirroring by default on all channels r=blassey
Bug 991923 - Set Android SDK version in DNS resolver. r=sworkman
Bug 1106559 - Improve the search preference UI, r=felipe,dao.
Bug 1106559 - Improve the in-content search preference UI, r=felipe.
Bug 1107278 - Localize the new searchbar UI for Firefox 35 - remove duplicated code to match the code landed on beta, r=felipe.
Bug 1111957 - Invalidate mDPI and mDefaultScale in TabChild when switching displays. r=fabrice.

Bug 1107259 made TabChild cache the display DPI and default scale more aggressively, and
we need to invalidate those caches when switching displays, otherwise we can get weird
scaling behaviours when switching between displays with different DPIs and scales.

--HG--
extra : rebase_source : cccbdae40113ae1a1b76d020ddc93e7b393fce61
extra : amend_source : d2664b4ea30342476e67da2a16315be4c1920abf
Bug 1112397 - Go back in testSettingsMenuItems on small tablet. r=gbrown
Bug 1108555 - [e10s] closing last tab does not focus urlbar (browser.tabs.closeWindowWithLastTab = false). r=jimm,mconley
Bug 1106876 - the one-click search header isn't updated immediately when the textfield value changes, r=felipe.
Backed out changeset 66cc38d90f25 (bug 1112397) for making testSettingsMenuItems permafail on Android 4.0.