Merge m-c to fx-team.
Bug 979477 - [Australis] Move to only showing two lines of text in the menu panel. r=mconley
Bug 980511 - Uplift Add-on SDK to Firefox
Bug 965606 - Part 0: Change home sync pref name, and type from boolean to ints. r=margaret
Bug 965606 - Part 1: Give users the choice to only sync home panel data when on wifi. r=margaret
Bug 965606 - Part 2: Update tests for new string and nested preference panels. r=margaret
Bug 977217 - [Australis] Clicking API-widget borders in the menu panel does nothing. r=Gijs
Bug 980879 - [Australis] Navigation buttons in urlbar overlapping search bar when resizing a window when on verified identity site. r=Gijs
Merge m-c to fx-team
Merge f-t to m-c