Bug 1075353 - 1st inline activity is not killed before the second inline activity comes.
Bug 1079254 - [v2.2] Investigate test_number_keyboard intermittent failure
Bug 1069879 - Only three dots shown when entering passcode
TEST Revert "Bug 1069879 - Only three dots shown when entering passcode"

This reverts commit 2eec387ec469c52266bb9f6abca51e53b90ba623.
Bug 1084060 - [Window Management] Tapping on the Camera is recording notification, opens up the download system update window
Merge pull request #25372 from viorelaioia/bug_1079254_v2.1

Bug 1079254 - [v2.2] Investigate test_number_keyboard intermittent failu...
Bug 1081509 - [BB] update modals to the latest visual design
Merge pull request #25312 from cctuan/1075353-v21

Bug 1075353 - 1st inline activity is not killed before the second inline activity comes.
Merge pull request #25066 from snowmantw/bug1069879

Bug 1069879 - Only three dots shown when entering passcode
Bug 1085414 - Allow apps that are symbolically linked to be unit tested

Conflicts:
	Makefile
Bug 1082563 - video playback screen remains black for few sec after suspend resume in video app
Bug 1086644 - Changing performance tests back to use legacy screen unlocking
Bug 1081243 - [Downloads] A recently download file can not be open. Patch v2.1
Merge pull request #25399 from gmarty/Bug-1084060-Tapping-on-the-Camera-is-recording-notification-opens-up-the-download-system-update-window-quick-fix

Bug 1084060 - [Window Management] Tapping on the Camera is recording not...
Bug 1079810 - Don't initialize an AudioContext on Callscreen init. r=gsvelto
Bug 1085380 - First activity is not killed after the second one started
Bug 1085496 - Fix Lockscreen "SIM X Carrier" text overlapping by using margin instead of fixed width
Bug 1078672 - [Clock] Alarm sound becomes "No Sound" after OTA upgrade from 2.0 to 2.1.
Bug 1086715 - make sure update dialogs still work without SHB
Bug 1085201 - [Flame][Tako][v2.1][Settings] "Searching device" not hidden as Sony SBH50 BTHS paired via NFC