Bug 1027396 - Stk Timer Expiration Envelope Command requires timer value
Bug 1056883 - Fix contact info being clipped due to distance to addl. being too small. r=Rik
Bug 1041901 - Fix contacts theme color
Bug 1041903 - Fix theme color for dialer again
Bug 1041904 - Update email theme color
Bug 1041910 - Add theme color for music app
Bug 1039326 - Update settings app css
Bug 1057273 - [Flame][v2.1] Cannot set app permission when executing test_everythingme_search.py
Merge pull request #23118 from davidflanagan/bug1051172-v2.0

Bug 1051172: a stoprecording event hack so the camera can stop recording more quickly on app transitions. r=kgrandon,justindarc a=2.0+(cherry picked from commit 4ea69f01f52f472331d12b001ec1e37631bff575)

Conflicts:

	apps/camera/index.html
	apps/camera/js/app.js
	apps/camera/js/config/require.js
	apps/camera/js/controllers/camera.js
	apps/camera/test/unit/setup.js
	apps/system/js/app_window_manager.js

remove unused listenForAttentionScreen function
Bug 1047660 - Making the software home button and the edge gestures play nice in landscape.
Bug 1056347 - [Flame] touch to focus circle does not persist
Bug 1057396 - display page title in cards view for browser windows
Bug 1057277 - [Email][Signature] Signature text displayed different with UX specification
Merge pull request #23168 from mikehenrty/bug-1041904-email-theme-revisted

Bug 1041904 - Update email theme color
Bug 1041902 - Add theme color for cost control
Merge pull request #23166 from mikehenrty/bug-1041902-cost-control-theme-revisit

Bug 1041902 - Add theme color for cost control
Merge pull request #22751 from mikehenrty/bug-1041910-music-theme

Bug 1041910 - Add theme color for music app
Merge pull request #23167 from mikehenrty/bug-1041903-dialer-theme-revisit

Bug 1041903 - Fix theme color for dialer again
Merge pull request #23214 from davidflanagan/bug1051172-v2.1

Merge pull request #23118 from davidflanagan/bug1051172-v2.0
Bug 1057529 - Move l10n.js in Settings to no-defer