Bug 1080051 - [FTE] Tapping on the SIM 1 PIN text box does not invoke the keyboard
Bug 1081132 - Possible to get lock screen into landscape mode
Bug 1083129 - [System][Music] send pause command to music app when headsets are disconnected

Conflicts:

	apps/system/test/unit/media_playback_test.js
Bug 1089459 - [Settings] Performance regression on bug 1066830
Bug 1092112 - [Messages] Waiting screen never disappears if user confirms thread deletion when there is not any selected thread. r=schung
Bug 1086676 - Add a test to check notification when you miss a call from a known contact
Bug 1082935 - Fixing scope problem with bluetooth transfer device name
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.
Merge pull request #25682 from dominickuo/v2.1-bug-1083129

Bug 1083129 - [System][Music] send pause command to music app when headsets are disconnected, r=jimporter
Merge pull request #25446 from cctuan/1080051-v21

Bug 1080051 - [FTE] Tapping on the SIM 1 PIN text box does not invoke the keyboard
Bug 1071114 - Tweaking the rocketbar collapsing transition.
Bug 1090562 - [Rocketbar] Implement transitions again r=etienne

Conflicts:
	apps/system/js/app_chrome.js
	apps/system/js/rocketbar.js
	apps/system/test/unit/rocketbar_test.js
Merge pull request #25746 from KevinGrandon/bug_1090562_2_dot_1_uplift

Bug 1090562 - [Rocketbar] Transitions are missing
Merge pull request #25701 from JohanLorenzo/bug-1086676-v2.1

Bug 1086676 - Add a test to check notification when you miss a call from...
Bug 1088575 - [LockScreen][EmergencyCall]After click 'More info' in app permission, enter emergency call will get all functionalities broken
Bug 1087475 - [Flame][Camera]The viewfinder will fail to function when the user opens and closes the camera app multiple times via the home button
Bug 1090149 - Ignore opening timeout is app is killed