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.
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 1082457 - Adding integration tests to statusbar