Bug 979320 - Bolster wait in wait_for_cards_view to avoid edge gesture hit zones
Revert "Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen"

This reverts commit 8e41704de226a75ce5ce6420b70016f39eb57ea6.

Reverting test due to intermittent test failure.
Merge pull request #16833 from zacc/bug_979320

Bug 979320 - Bolster wait in wait_for_cards_view to avoid edge gesture h...
Bug 968483 - [Building Blocks] Update header design to accommodate larger back-button