Merge pull request #10487 from frsela/Bug884745

Bug 884745 - Change debug() method to the new window.DUMP in icc*.js, r=kaze(cherry picked from commit 08c9cf50fe1d2e8bbb3931d61e0a30c6a1bc6b6c)

Conflicts:
	apps/settings/index.html
Merge pull request #10607 from frsela/STK/Bug880356

Bug 880356 - [STK] "STK_CMD_GET_INPUT" code refactoring, r=timdream(cherry picked from commit b2da43408f4f53429db6b0a7f22c80aa73b87580)

Conflicts:
	apps/settings/js/icc.js
Merge pull request #10678 from Rik/translate-comments-883787

Bug 883787 - Translate lazy loaded panels after loading them r=kaze
(cherry picked from commit aa2676c1a79de4ee21664abf78bae97645cf83ae)

Conflicts:
	apps/communications/dialer/js/dialer.js
Merge pull request #10568 from lodr/bug-885314-highlight-out-of-date

Bug 885314 - Highlight how balance is going out of date.
r=jmcanterafonseca
(cherry picked from commit c8f72f628bf350d6425b4c6569965e8ad00b3d80)

Conflicts:
	apps/costcontrol/widget.html
Merge pull request #10658 from ian-liu/settings/Bug881985_do_not_update_language_button_and_description_in_Language_menu

Bug 881985 - [Settings] Do not update language button and description in Language menu, r=@fabi1cazenave(cherry picked from commit 0f6d59ee2868df0c3b88c88af881c121ae4cf623)

Conflicts:

	apps/settings/index.html
	apps/settings/js/settings.js
Merge remote-tracking branch 'upstream/v1-train' into v1-train