Bug 924946 - Change test_ftu_with_tour so it can work on desktopb2g
Bug 930018 - Fix test_ftu_with_tour.py on aurora
Bug 928414 - [v1.2] Write a test to use the 'Number' keyboard on aurora
Merge pull request #12835 from wanderview/shared-tvm-append

Bug 918179: Optimize append case in tag_visibility_monitor.  r=djf
(cherry picked from commit ea967f79e5f29e752b9abb4df14fc334946560a0)
Revert "Merge pull request #12292 from basiclines/settings-highlights"

This reverts commit d699497bbc7885a1b7e15956af7f7357badc7392.
Merge pull request #12927 from nullaus/bug918143-group-notifications

bug 918143(cherry picked from commit 163f47b8ca0c6f9cead75347793d8fc39bfefa59)

Conflicts:
	apps/system/test/marionette/lib/notification.js
	apps/system/test/marionette/notification_test.js
Merge pull request #13077 from nullaus/v1.2

Merge pull request #12927 from nullaus/bug918143-group-notifications
Bug 928408 - Test notification when the screen is locked on aurora
Bug 928407 - Improve test_import_contacts_from_SIM.py on aurora
Merge pull request #13086 from viorelaioia/bug-928408_1

Bug 928408 - Test notification when the screen is locked on aurora
Merge pull request #13062 from viorelaioia/bug-928414

Bug 928414 - [v1.2] Write a test to use the 'Number' keyboard on aurora
Merge pull request #13089 from AndreiH/bug928407

Bug 928407 - Improve test_import_contacts_from_SIM.py on aurora
Merge pull request #13044 from bobsilverberg/fix_ftu

Bug 930018 - Fix test_ftu_with_tour.py on aurora
Bug 925370 - Update e.me app on aurora
Merge pull request #12795 from teodosia/eme-updates

Bug 925370 - Update e.me app on aurora