Bug 902800 - [FTU] Flickering with start tour screen after About Firefox OS screen r=fcampo
Bug 892520 - Ensure proper upgrade path
Bug 900848 - Use withheld-number string key instead of unknown in call log

Also remove a portion of dead code that was referring to the unknown
key: since |Utils.getPhoneNumberPrimaryInfo| will return null in case
|matchingTel| is invalid, it means that either way we will have been
thrown out of this code previously, since the |matchingTel| is being
checked for in the if() code just above.
Merge pull request #10929 from lissyx/bug892520

Bug 892520 - Ensure serialization of upgrade path
Bug 889245 - [Call log] Display emergency number or Voicemail string
Bug 895226 - Get the previous call from handledCalls directly
Merge pull request #11333 from crh0716/900386

Bug 900386 - Use localize function to do localization r=evelyn
Merge pull request #10865 from lissyx/bug889245

Bug 889245 - [Call log] When user make a voicemail call, call log shows ...
Merge pull request #11419 from jmcanterafonseca/edit_active_merge

Bug 902391 - Active merge in edit mode for Contacts
Merge pull request #11378 from jmcanterafonseca/align_fb_active_merge

Bug 901571 - FB Contacts must not match under different circumstances
Bug 902390 - [sms][mms] the input is 1px too high with the 'Moz' font r=borja
Merge pull request #11421 from lissyx/bug900848

Bug 900848 - Use withheld-number string key instead of unknown in call log r=etienne
Bug 879199 - Remove mobileconnection permission from SMS app r=julienw
Merge pull request #11409 from ochameau/bug902625

Bug 902625 - DEVICE_DEBUG doesn't correctly set remote debugging mode r=@vingtetun
Bug 875338: the content is not scrolled down when sending an MMS, r=gnarf
+ do not scroll to bottom if the user already scrolled manually
Bug 875338: unit tests
Merge pull request #11055 from fabi1cazenave/smsCursorScroll-bug875338

Bug 875338: the content is not scrolled down when sending an MMS, r=gnarf
Revert "Merge pull request #11055 from fabi1cazenave/smsCursorScroll-bug875338"

This reverts commit 96e8da02b834bc15fc4adc402b40c08ba36b2a59, reversing
changes made to b3fb4af5ef69ac087afc77329fdd82d5c6d122a0.
Bug 875338: the content is not scrolled down when sending an MMS, r=julienw
Merge pull request #11428 from fabi1cazenave/smsCursorScroll-bug875338

Bug 875338: the content is not scrolled down when sending an MMS, r=julienw