Bug 964188 - [Settings] fix main integration jshint
Bug 968382 - software home button doesn't work when rocketbar is active r=alive
Bug 933365 - [Messages] Consider adding the resend option in the message context menu for errored message
Bug 968794 - Test test_settings_do_not_track fails intermittently on device
Bug 964252 - Move FakeUpdateChecker code into a method or class r=zcampbell
Bug 968669 - Migrate code snippet for calendar customization from applications-data.js to apps/calendar/build/build.js
Bug 968854 - test_ftu_skip_tour.py fails because bug 965912
Merge pull request #15757 from gasolin/issue-964188

Bug 964188 - [Settings] fix main integration jshint, r=arthur
Merge pull request #16065 from yurenju/calendar-makefile

Bug 968669 - Migrate code snippet for calendar customization from applications-data.js to apps/calendar/build/build.js, r=timdream
Merge pull request #16041 from kumarrishav/issue-933365

Bug 933365 - [Messages] Consider adding the "resend" option in the message context menu for errored message
r=rwaldron
Merge pull request #16032 from KevinGrandon/bug_968382_software_buttons_level

Bug 968382 - software home button doesn't work when rocketbar is active r=alive
Bug 969287 - Keyboard click sound should not be enabled by default r=janjongboom
Merge pull request #16016 from gentlefolk/964252

Bug 964252 - Move FakeUpdateChecker code into a method or class
Merge pull request #16070 from AndreiH/bug968854

Bug 968854 - test_ftu_skip_tour.py fails because bug 965912
Merge pull request #16042 from AndreiH/bug968794

Bug 968794 - Test test_settings_do_not_track fails intermittently on dev...
Merge pull request #16076 from KevinGrandon/bug_969287_keyboard_sound

Bug 969287 - Keyboard click sound should not be enabled by default r=janjongboom