Bug 976846 - Update active app earlier
Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen
Merge pull request #16681 from alivedise/bugzilla/976846_master/update-active-app-early

Bug 976846 - Update active app earlier, r=timdream
Bug 968681 - Add marionette tests for the display panel
Merge pull request #16596 from crh0716/968681

Bug 968681 - Add marionette tests for the display panel r=evanxd
Merge pull request #16619 from gtorodelvalle/contacts-bug-972600-add-contact-after-merging

Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen