Revert "Merge pull request #9294 from fcampo/RemainingPinIntents-settings"
This reverts commit 8c27d942e4cec036e05390b07d8f37049df5cadb.

Revert "Bug 860660 - [settings][dialer][system] PIN/PUK retry counter now displayed correctly.  r=fcampo"
This reverts commit 4eadbbe13043807cdb02a049076949e78d87f90d.
Merge pull request #9352 from fcampo/RemainingPinIntents-ussd

[dialer] Bug 860660 - PIN&PUK: Show counter of trials remain(cherry picked from commit 887cae7e556fc19722011f0674fdd4d4bfeacc3e)
Merge pull request #9340 from fcampo/RemainingPinIntents-system

[system] Bug 860660 - PIN&PUK: Show counter of trials remain(cherry picked from commit b565d874e9dba9d182c9952500869956365dbba4)
Merge pull request #9246 from fcampo/RemainingPinIntents-ftu

[ftu] Bug 860660 - PIN&PUK: Show counter of trials remain(cherry picked from commit 7faefd0273f4dce24563cda57450bfb1c7416b45)
Merge pull request #9294 from fcampo/RemainingPinIntents-settings

[settings] Bug 860660 - PIN&PUK: Show counter of trials remain(cherry picked from commit 4cd2d491c28e7312a2c070ea4bbaf76442161794)

Conflicts:
	apps/settings/index.html
	apps/settings/locales/settings.en-US.properties
Bug 860660 - [settings][dialer][system] PIN/PUK retry counter now displayed correctly.  r=fcampo
Merge pull request #9675 from dominickuo/davidflanagan-bug870584

Bug 870584 and Bug 870587: minor tweaks to the open activity save ux, r=@dominickuo(cherry picked from commit 1fc127e4af12a7a158fa1b975a1de18d147947f2)
Merge pull request #9685 from davidflanagan/bug870584-v1-train

Merge pull request #9675 from dominickuo/davidflanagan-bug870584
Merge pull request #9631 from davidflanagan/bug833704

Bug 833704: don't regenerate poster image. r=daleharvey(cherry picked from commit f73e380ec94496707180aa8c4be0e87fdf65d9d2)
Merge pull request #9686 from davidflanagan/bug833704-v1-train

Merge pull request #9631 from davidflanagan/bug833704
Merge pull request #9603 from xiupinglong/v1.0.1

Bug 862193 - [Buri][Notification][Language]Overlap on notification r=Etienne(cherry picked from commit 50fb9c6239f983545bca6083c4fc2dc917c7807d)
Merge pull request #9608 from gnarf37/extra-threads

Bug 869799 - [sms] Receiving two messages at once should not trigger multiple threads of the same id(cherry picked from commit ca7ae7c57f05f4c10166c243aa78c73084e36c96)
Merge pull request #9648 from lightsofapollo/bug-870512-cannot-update-accounts

Bug 870512 - Ensure duplicate account checks don't apply to updates of t...(cherry picked from commit ab496424b3268805817c8331b73f7a779b1434e3)
Merge pull request #9638 from alivedise/bugzilla/867912/silent-mode-on-device-menu

Bug 867912 - Silent notification channel when silent incoming calls(cherry picked from commit 8b2e95522652dedc68052152ea6e49faba1cc013)
Merge pull request #9533 from mozshiao9/master_bug857195

Bug 857195 [Calendar] Importing a google calendar with all-day events with alarm reminders specified indicates and operates under the wrong alarm reminder amount.(cherry picked from commit 67c017864552d08f5f62c68ff457453738f61012)
Merge pull request #9605 from huchengtw-moz/video/Bug_866848-video-app-crash

Bug 866848 - [B2G][Inari][Video] “Video” app crashes after a few seconds, r=djf(cherry picked from commit 162a80393d4302c9b962405957583549799604c0)
Merge pull request #9673 from etiennesegonzac/860570-bluetooth-hold-and-resume

Bug 860570 - Hold and resume support for 1 call (needed for bluetooth)(cherry picked from commit 340201b4b7352205dedb00463253de527e2c479a)
Merge pull request #9677 from bentian/bug-870727

Bug 870727 - [Gallery] Video in gallery are not properly seeked. r=daleharvey(cherry picked from commit 09f086200f281444d890eb6b8a5fe54fc8836b24)
Merge pull request #9672 from ferjm/bug861921.lowdevicestorage.aux

Bug 861921 - Notify the user about the low free storage situation. r=eti...(cherry picked from commit fad3da3881351a6a2b66fcddb2fe2dd0b72eddb2)

Conflicts:

	apps/system/index.html
	apps/system/locales/system.en-US.properties
Bug 871210 - reference on responsive.css causing error on building gaia at v1.0.1 and v1-train branches. r=me