Bug 981604 - [System]: Time Picker doesn't change when language is changed in Settings
Bug 820344 - [FTE] Improve localizability of privacy/telemetry links using placeholders instead of concatenations
Bug 983059 - Wait for mozWifiManager to be ready before proceeding with test_ftu_skip_tour.py
Bug 964180 - Introduce AMD to settings app
1. Support new panel model
2. Separate common logic to SettingsCache, PanelUtils, PageTransitions
Bug 814936 - [system] use "…" instead of ".." in bluetooth error messages, remove unused strings
Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button
943976_Attaching_Video_MMS_Prompts_Wrong_Error_Message
Bug 814855 - [Calendar] Remove unused string error-no-url from calendar.properties
Merge pull request #17281 from crh0716/settings2_bubble_tea_to_master

Bug 964180 - Introduce AMD to settings app r=evelyn, etienne
Merge pull request #17318 from flodolo/bug814855

Bug 814855 - [Calendar] Remove unused string 'error-no-url' from calendar.properties
Merge pull request #17316 from flodolo/bug814936

Bug 814936 - [system] use "…" instead of ".." in bluetooth transfer messages, remove unused strings
Merge pull request #17013 from flodolo/bug820344_jslinks

Bug 820344 - [FTE] Improve localizability of privacy/telemetry links using placeholders
Merge pull request #17288 from arcturus/bug-983777

Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button
Revert "Merge pull request #17275 from cctuan/979827"

This reverts commit 11d6cd3d50c5a92a85a738a8de5a36932c8a89e6, reversing
changes made to ce8a5f8153d45000e39fc9e4b2b94521747015c3.
Bug 985409 -  Fix JSHint issues with test/unit/setup.js
Merge pull request #17257 from zacc/bug_983059

Bug 983059 - Wait for mozWifiManager to be ready before proceeding with ...
Merge pull request #17317 from ankit93040/943976_SMS/MMS__Attaching_Video_MMS_Prompts_Wrong_Error_Message

Bug 943976: Attaching_Video_MMS_Prompts_Wrong_Error_Message, r=schung
Merge pull request #17323 from Rik/jshint-settings-985409

Bug 985409 -  Fix JSHint issues with test/unit/setup.js r=arthur
Bug 984882 - 946874 l10n follow up. r=rik
Bug 982196 - Upgrading the ReflowHelper to use the new devtools tooling.
r=gaye,janx