Bug 1086285 - update licensing information for v2.1.
Bug 1080051 - [FTE] Tapping on the SIM 1 PIN text box does not invoke the keyboard
Bug 1083217 - Add a test to play a song in artist list view
Bug 1086269 - Add a test to set up a conference call
Bug 1088389 - [Search] Remove divider shown when searching r=daleharvey
Bug 1081132 - Possible to get lock screen into landscape mode
Merge pull request #25449 from gerv/v2.1

Bug 1086285 - update licensing information for v2.1. r=arthurcc
Bug 1083129 - [System][Music] send pause command to music app when headsets are disconnected

Conflicts:

	apps/system/test/unit/media_playback_test.js
Merge pull request #25664 from JohanLorenzo/bug-1086269-v2.1

Bug 1086269 - Add a test to set up a conference call
Bug 1086676 - Add a test to check notification when you miss a call from a known contact
Merge pull request #25662 from viorelaioia/bug_1083217_v2.1

Bug 1083217 - Add a test to play a song in artist list view
Bug 1077258 - Intermittent test failure - Fix FTU test
Bug 1043762 - Volume buttons don't do anything in Settings and previewing new ringtones
Bug 1087026 - [2.1][l10n][cost control] Multiple locales: the line "use data alert" is overlapped by the toggle switch
Bug 1091137 - [ringtones] Fix clearing out the tonePlayer's state when hiding the app

Conflicts:
	apps/ringtones/js/tone_player.js
Revert "Bug 1082935 - Fixing scope problem with bluetooth transfer device name"

This reverts commit 360929f939f69746945e7d32ce5b2b215ab495c3.
Bug 1069608 - Remove sim pin input scrollIntoView workaround
Merge pull request #25677 from mikehenrty/bug-1069608-remove-workaround

Bug 1069608 - Remove sim pin input scrollIntoView workaround
Merge pull request #25642 from snowmantw/bug1081132-2.1

Bug 1081132 - Possible to get lock screen into landscape mode
Revert "Revert "Bug 1069879 - Only three dots shown when entering passcode""

This reverts commit e3e6d3aded753bebcfcce185bd3a2b1d2f5b5104.

This commit remove the previous testing reverting commit which is
landed incorrectly, and let the approval+ and review+ patch land in v2.1.