Merge pull request mozilla-b2g#18732 from jaoo/998914-v1.3

Bug 998914 - [v1.3][Settings] Cannot preselect the APN correctly if ther...

Merge pull request mozilla-b2g#18736 from alivedise/bugzilla/1002316_…

…v1.3t_real/sound-manager-home-event

Bug 1002316 - Homescreen event should be caught by sound manager, r=timdream

Merge pull request mozilla-b2g#18602 from jimporter/music-update-hidd…

…en-scrubber

Bug 1000214 - [music] Update progress bar when display is suspended and ...
Conflicts:
	apps/music/test/marionette/Player_test.js

Merge pull request mozilla-b2g#17209 from mikeaich/bug975513_2

Bug 975513 - explicitly add/remove 'devicemotion' event listeners on Camera app focus/blur, r=jdarcangelo

Merge pull request mozilla-b2g#17231 from dominickuo/v1.3-bug-958470-new

Bug 958470 - [Ringtones] set ringer type to the ringtones player, r=jimporter

Revert "Merge pull request mozilla-b2g#16461 from gittup/bug-917630"

This reverts commit 0576cd3, reversing
changes made to c5cb252.

Revert "Merge pull request mozilla-b2g#16461 from gittup/bug-917630"

This reverts commit 0576cd3, reversing
changes made to c5cb252.

Merge remote-tracking branch 'b2g/bubble-tea' into bubble-tea

Merge pull request mozilla-b2g#14901 from etiennesegonzac/bug-952099-…

…better-hang-up-hit-target

Bug 952099 - Better hit target for the call screen hang up / pick up buttons. r=rik
(cherry picked from commit f400efc)

Bug 901926 - [Email] Email app stops working if attachment contains a…

…n IMAP literal. r=asuth, a=Preeti