Bug 976846 - Update active app earlier
Bug 969315 - Implement the final 1.4 version of the app to app swipe transition.
Bug 969230 - [FTE] Email address field is covered by keyboard in about B2G OS page
Bug 977547 - JSHint fixes for Search r=mcav
Bug 973616 - [Camera] Videos should be recorded to final location
Bug 858017 - [COST CONTROL] Use Gecko native support for data usage alarms provided by NetworkStats API 2.0
wip
Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen
Fix .gitignore for music2 [NPOTB]
Revert "Merge pull request #16739 from mcjimenez/bug976951_v2" for gaia-unit test bustage

This reverts commit 61391cd5b77e5085dd1362eee7014c56fefbbdfb, reversing
changes made to 26fa8fe02e656655bc9b89e0c5e74f135965e799.
Bug 978364 - Fix missing helper call in FTU integration tests
Bug 978364 - Move FTU Tests to correct filename scheme
Bug 947816 - [music] Test parsing of id3v2.* metadata
Merge pull request #16690 from jimporter/music-id3-tests

Bug 947816 - [music] Test parsing of id3v2.* metadata
Merge pull request #16371 from wilsonpage/bug/973616

Bug 973616 - [Camera] Videos should be recorded to final location
Revert "Bug 972666 - [Calendar] lines over events longer than 2 hours"

This reverts commit b7271eda0061be6e2dd223392b519dfb45157512.

Conflicts:
	apps/calendar/style/week_view.css

Reverting due to intermittent failing marionette test.
Bug 978433 - Disable intermittent failing unit test
Merge pull request #16758 from KevinGrandon/bug_978433_disable_failing_test

Bug 978433 - Disable intermittent failing unit test
Bug 976951 - Customize network indicator displayed in quick settings
r=vingtetun
Bug 978440 - Disable test so we don't have to close the tree