Bug 925307 - [Contacts] In search mode, clicking INTRO on the keyboard exits the search mode

(cherry picked from commit 0e085759b69f24ef9c8d1299ed1bd4d7a3268528)
Bug 925307 - [Contacts] In search mode, clicking ENTER on the keyboard exits the search mode (follow-up)

(cherry picked from commit bac2948c4ee6aecdd5d622f47866b9631acbd762)