Bug 939062 - Improve wait in test_add_contact_to_favorites.py
Merge pull request #13925 from wanderview/contacts-group-overflow-3

Bug 937291: Limit overflow of each group list.  r=arcturus
Merge pull request #13747 from bobsilverberg/bug939062-v1.2

Bug 939062 - Improve wait in test_add_contact_to_favorites.py
Revert "Merge pull request #13946 from timdream/keyboard-pref-off-v1.2"

This reverts commit 7bd5adfa1f201dc7b9cfbc8e555faef0b75b944c, reversing
changes made to 7b24f1d1f167fc40b1e887f4ff3746d383af3c2f.