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 1080799 - Connecting to/joining (hidden?) Wi-Fi fails after factory resetting phone/first run, restart required. Patch v2.1
Bug 1074107 - Add wallpaper test themes to dev-apps. r=fabrice
Bug 1038178 - [Vertical Homescreen] Use scrollbar from root scrollframe r=Cwiiis
Bug 1038178 - [GaiaGrid] Use document scroll frame for calculation r=kgrandon
Bug 1081270 - [Flame][Camera] Face tracking circle stops tracking once recording starts
Merge pull request #25402 from mancas/bug1080799_v2.1

Bug 1080799 - Connecting to/joining (hidden?) Wi-Fi fails after factory ...
Bug 1079953 - [Lockscreen][Camera] Non-function UI in preview when camera app is launched from the Lockscreen with Passcode enabled.
Bug 1062114: double-check that we're still hidden before exiting
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