Bug 841366 - [l10n][Gallery] Button to set an image as wallpaper from gallery has not enough space to shown the string in many locales
Bug 1046202 - Copy improvement when battery is almost empty
Bug 952651 - [Gallery][Photo Editor] Fixed slider button sliding from previous position
Bug 1027396 - Stk Timer Expiration Envelope Command requires timer value
Bug 1009099 - Remove wait_for_* methods from GaiaTestCase where possible
Bug 1054953: make the FL app handle the incorrect audio/mp3 mime type
Bug 1053711 - call nsIFile.remove() only if it exists in build/media-resolution.js r=gduan
Bug 1046505 - [Text Selection] Implement temporary shortcut for utility bubble.
Bug 1043905 - Add contacts to the SIM in setUp
Bug 1056883 - Fix contact info being clipped due to distance to addl. being too small. r=Rik
Bug 1056975 -  Backout Browser specific CSS rules for French from 2.0 to fix tabs in Browser
Bug 1041901 - Fix contacts theme color
Bug 1041903 - Fix theme color for dialer again
Bug 1039326 - Update settings app css
Bug 1041313 - Update css for settings buttons
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 1055356 - Make the 'unread' flag and contact photo screen reader visible.
Bug 1056347 - [Flame] touch to focus circle does not persist