Bug 1078151 - [Comms][Contacts]After we tap "Search" in Gmail view,some contacts without picture have a circle.
Bug 1019120 - [camera] Recorded video in secure mode doesn't appear in Gallery
Merge pull request #24807 from mpizza/Bug_1070458

Bug 1078151 - [Comms][Contacts]After we tap "Search" in Gmail view, some contacts without picture have a circle.
[Bug 1055270] [KK Only][Flame][Camera] Face detection coordinates are inverted
Bug 1079700 - Correcting errors in performance testing
Merge pull request #24902 from justindarc/bug1019120-v2.0

Bug 1019120 - [camera] Recorded video in secure mode doesn't appear in G...
Bug 1074152: Handle discoverystatechanged event in bluetooth app.
Merge pull request #24850 from dmarcos/bug1055270v2.0

[Bug 1055270] [KK Only][Flame][Camera] Face detection coordinates are in...
Bug 1070825 - Remove the check of not dialing the same number twice
Bug 1025147 - [B2G][Video]The slider overlaps the video time length when the playback ends
Merge branch 'v2.0' into v2.0m.
Revert "Bug 1070825 - Remove the check of not dialing the same number twice"

This reverts commit 5082fc56ef80352b7bc1be6b934286d815f069d8.
Merge branch 'v2.0' into v2.0m
Bug 1063658: workaround memory-backed blob bug 1079546 by ensuring that pick and share activities always use files

Conflicts:
	apps/gallery/index.html
Merge pull request #24954 from eliperelman/bug-1079700-v2.0

Bug 1079700 - Correcting errors in performance testing
Bug 1070825 - Remove the check of not dialing the same number twice
Bug 1056968 - [System] vibrates to notify the user vibration is enabled when volume is 0. r=alive, a=2.0m+
Merge branch 'v2.0' into v2.0m.
Bug 1077259 - Move the data connection settings from the per-sim panel to the upper panel
Bug 1074601 - Take SIM card 2 into consideration when checking voicemail number

Conflicts:
	apps/callscreen/test/unit/handled_call_test.js
	apps/communications/dialer/test/unit/dialer_test.js
	build/jshint/xfail.list