Bug 995540: stop recording video before ringer or alarm sound is heard
Bug 1001049 - use specific version of marionette apps r=gaye a=tests
Bug 999286 - [Sora][Message]The content is lost after do some operations. r=julien
Merge pull request #18876 from azasypkin/v1.3-bug-999286-home-activity

Bug 999286 - [Sora][Message]The content is lost after do some operations. r=julien
Merge pull request #19085 from davidflanagan/bug995540

Bug 995540: stop recording video before ringer or alarm sound is heard r=dmarcos,alive
Merge pull request #18979 from gitmai/bug-1006348-app-mantain-previous-view

Bug 1006348 -[Cost control] After minimizing the app with the settings s...
Merge branch 'v1.3' into v1.3t

Conflicts:
	apps/system/js/attention_screen.js