Revert "Revert "Merge pull request #17988 from bobsilverberg/cards_view_v1.3""

This reverts commit f43898e5c9488ae8614c71d2fe9b7c205726c471.
Fix issue with mozdevice >=0.31 on TBPL
Merge pull request #18050 from bobsilverberg/revert_revert

Bug 991657 - [v1.3] Backport test_cards_view_with_two_apps.py test to v1.3