Bug 900386 - Use localize function to do localization
Bug 901837 - Test app for receiving WAP Push.
Bug 901571 - FB Contacts must not match under different circumstances
Merge pull request #11393 from chuck-lee/bug-901837_WAP_Push_test_app

Bug 901837 - Test app for receiving WAP Push. r=arthurcc
Bug 902391 - Active merge in edit mode for Contacts
Bug 896934 - [Settings] Listen new system message for Bluetooth pairing requests in connectivity.js
Merge pull request #11380 from cctuan/896934

Bug 896934 - [Settings] Listen new system message for Bluetooth pairing requests in connectivity.js
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
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