Merge pull request #8824 from ssaroha/sms-header-contact-838002

Sms header 838002: Invoke dialer and option menu for contacts from Sms header  r=borjasalguero(cherry picked from commit 99a78752f3c99518fc17fb73055860298bdcb386)
Merge pull request #8720 from albertopq/contacts-activities-headers

Bug 848771 - Make Transition from adding number to a contact look seamless r=arcturus(cherry picked from commit 3551291cfb1bd25a640619198ce0846f21a27fbf)
Merge pull request #8799 from frsela/STK/Bug847043

Bug 847043 - [Buri][STK]setup call with empty alpha ID ,return TR no response, r=kaze(cherry picked from commit 033d659faada0fc0a17cd46d9daab01b6d14136d)
Merge pull request #8751 from jrburke/bug852710-onlinedelay

Bug 852710 - [email] Defer protocol JS load and init r=asuth(cherry picked from commit 0ab2773d3af8721e9ef05d1a5f47a3523b0aee25)
Merge pull request #8769 from jrburke/bug853908-noautoconf-load

Bug 853908 email: point where to find codepages parts not in protocol r=asuth(cherry picked from commit 1ff80f302d47527abb9030f79b2099d97daa029e)
Merge pull request #8755 from mozsquib/email-activesync-sendmail

Bug 853659 - [email/activesync] Fix sending mail on Exchange 2007 and lower(cherry picked from commit 670ecf09154d36fed63a98dd112c4f2c434e9196)
Merge pull request #8812 from crdlc/bug-854610

Bug 854610 - [B2G][Homescreen] Moving ICONs results in overlapping and s...(cherry picked from commit 7d36796fcd49eed018139b76257f6b039fa24ba5)
Merge pull request #8652 from ferjm/bug848415.perftests

Bug 848415 - [Dialer] Create performance tests for the call log. r=etien...(cherry picked from commit 7fc1cc5c5d3bfdcefc48efcb1ed0a3e973b89862)
Merge pull request #8842 from evanxd/bug-855175

Bug 855175 - [Contacts] Add contact: After clicked an input field and switched to the Lable page directly, the keyboard did not hide.(cherry picked from commit 8fc1b68d4018ad7d9dad272426b19e576189ac4f)
Merge pull request #8476 from lightsofapollo/calendar-list-overflow

Bug 848033 Prevent horizontal overflow in drawer r=kevingrandon(cherry picked from commit 9c56005527aed132ac47bc4c7c4d1b8b41f2449e)
Merge pull request #8400 from frsela/STK/Bug845576

Bug 845576 - STK: No Terminal Response sent after PLAY_TONE, r=vingtetun(cherry picked from commit aafcb4fbcfb303718fdd824ccd7f30e94943c621)
Merge pull request #8820 from frsela/STK/Bug847033

Bug 847033 - [Buri][STK]The ME should only input "0~9,*,#,+" when execute get input with CQ=00, r=kaze(cherry picked from commit b0dd684aae63e0b696d6dd75307527897f42c71a)
Merge pull request #8739 from crdlc/bug-852924

Bug 852924 - Follow-up Bug 849186 memory optimizations for Import tasks(cherry picked from commit d2a68bc3c26312bbd70c926aedbdef0fc972805e)
Merge pull request #8831 from mozsquib/email-delete-account

Bug 850904 - Fix account deletion so that nothing gets saved after deletion occurs(cherry picked from commit fcef8d991beacf2a63c49b8fbc5e4ae3d660d226)
Merge pull request #8797 from frsela/STK/Bug845576_b

Bug 845576 - STK: No Terminal Response sent after PLAY_TONE, r=kaze(cherry picked from commit 0297a1ac0657c714e695eb3ea02a3f2f45658ce4)
Merge pull request #8798 from samjoch/bug-833383-BasedOnMozillaTechnologyShouldBeAlignedWithTheTextOnTheLeft

Bug 833383 - "based on mozilla technology" should be aligned with the text on the left r=me(cherry picked from commit 55f3054f90397251d4310e3d3f7f050dace2a020)

This includes an updated version of logosmall@2x.png from Bug 830644, please don't
overwrite it if you uplift Bug 830644.

Conflicts:
	shared/resources/branding/unofficial/logosmall@2x.png
Merge pull request #8823 from jmcanterafonseca/fix_hotmail_userid

Bug 854851 - Hotmail import does not import contacts which user_id is nu...(cherry picked from commit 06bbd6d0503c095ecfcddebbad1461465118613c)
Merge pull request #8822 from crdlc/bug-854840

Bug 854840 - Follow-up bug 852924 to fix unit tests(cherry picked from commit 3b47892b8680e226f175fc9c1551a17add803d72)
Merge pull request #8872 from mcirlanaru/bug_834084

Bug 834084 - Hide utility-tray when simpin-dialog is shown and fix co… (cherry picked from commit 4353d780f1393182be49b83d40a7ca7cfeea424d)
Merge pull request #8310 from mozsquib/music-search

Bug 838033 - Music search(cherry picked from commit 44abc870fd24f2c4d4de9fe9c2d162d29b16a143)