Merge pull request #10262 from ian-liu/clock/Bug878701_no_received_localized_event_while_onring_page_loaded

Bug 878701 - [Buri][REG][Alarm]Alarm clock to remind interface display abnormal, no ring , keypad can not operate it., r=@timdream(cherry picked from commit 8aa9a8f905294f3d821f85f1a4a27d47d6ba9a57)
Merge pull request #10219 from basiclines/email-fixes

Bug 878759 - [Buri][Email] 'Manual setup' link on 'New Account' screen is hard to click on. r=asuth(cherry picked from commit 02cf4ee5110c1d5ede7cc8db7185cb7929547f27)

Conflicts:

	apps/email/style/setup-cards.css
Merge pull request #10216 from mpizza/873995_EmergencyCall

Bug 873995 - [Buri][SOS]Can not dial the Emergency Call without SIM card after turn off the airplane mode, r=@timdream, a=tef+
uplift: bug 879193 - simplified WPS connection status
Merge pull request #10368 from fabi1cazenave/uplift-bug879193

uplift: bug 879193 - simplified WPS connection status
Bug 882363 - Only enable Facebook functionality if the app id is part of the partner customization.
Revert "Bug 882363 - Only enable Facebook functionality if the app id is part of the partner customization."

This reverts commit d2151b9b162aa93554921d249636b36208758ea5.
Bug 882363 - Only enable Facebook functionality if the app id is part of the partner customization.
Bug 876335 - Update additional information by HandledCall itself
Merge pull request #10458 from Rik/disable-travis

Bug 884217 - Disable travis on v1.1.0hd r=yurenju(cherry picked from commit 48c005e720aaf810edc5d67ac2aa983dbbca47e1)
Merge pull request #9995 from cvan/marketplace-with-offline

update Marketplace packaged app with offline handler (bug 875849)(cherry picked from commit 1324eea22d3d850cd296c7330571315ab502331d)
[Bug 883510] Partner customization should be able to set Facebook OAuth 2 callback url completely
developer phone