Merge pull request #17493 from arcturus/bug-983777

Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button
Merge pull request #17404 from KevinGrandon/bug_985032_keyboard_menu

Bug 985032 - Long press the globe key won't be able to pop up the keyboard automatically