Merge pull request #9546 from evelynhung/issue-856782

bug 856782 - support mulitple storages settings, r=arthur(cherry picked from commit fef913839cc45039116a066784cc9c1d4a4e581b)

Conflicts:

	apps/settings/js/utils.js
	apps/settings/style/icons.css
	apps/settings/style/settings.css
	apps/settings/index.html
Merge pull request #9268 from lodr/bug-828155-avoid-flashes

Bug 828155 - Avoid flashing by delaying showing the tabs until we know what to show exactly
Cause r+(cherry picked from commit 34d0040465d4f01cdd575c3071af185db66bbca2)

Conflicts:
	apps/costcontrol/index.html
Merge pull request #9449 from lodr/bug-838624-ux-polish

Bug 838624 - Polishing balance and telephony views
Cause r+(cherry picked from commit a76c63446ca010662584820843b1b08a5e12ec92)

Conflicts:
	apps/costcontrol/index.html
	apps/costcontrol/style/views/balance.css
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

Conflicts:
	apps/communications/ftu/js/sim_manager.js
	apps/system/js/simcard_dialog.js
Merge pull request #9303 from crdlc/bug-861846-master

Bug 861846 - Landscape orientation locked apps render portrait in the ta...(cherry picked from commit d487a2c66c70cfee5ccb122a4fe788a9429bcfc4)
Merge pull request #9636 from mpizza/ce_audio

Bug 855792 - CE requirement on maximum volume, r=alive, a=blocking-b2g:tef+(cherry picked from commit 0e887e03411e76a46fce7b1e2f46c54265a90cae)
Merge pull request #9633 from steveck-chung/settings-mms-panel

Bug 842251 - [Settings]Configurable requisition for delivery report at sending messages. r=arthur.chen(cherry picked from commit 65a0f833064dbff4efc8210c86291897e9a9724e)
Merge pull request #9549 from davidflanagan/bug867231

Bug 867231 - add a Save button to the Gallery Open activity r=dkuo(cherry picked from commit ad01e40314fb800493e3865912b107b96664836b)
Merge pull request #9654 from davidflanagan/bug867231-v1-train

Merge pull request #9549 from davidflanagan/bug867231
Merge pull request #9632 from davidflanagan/bug869292

Bug 869292: add a save option to video app open activity r=dkuo(cherry picked from commit f02b2b29fbffe38f9a05fc53b16dc97049a9d55d)
Merge pull request #9655 from davidflanagan/bug869292-v1-train

Merge pull request #9632 from davidflanagan/bug869292
Merge pull request #9651 from davidflanagan/dominickuo-bug-867448

Bug 867448 - [music] add a save option to music app open activity r=djf(cherry picked from commit c00f94deb7325b024f37ca7ee0e7c51417ef2c87)

Conflicts:

	apps/music/js/open.js
	apps/music/locales/music.en-US.properties
	apps/music/open.html
Merge pull request #9656 from davidflanagan/bug867448-v1-train

Merge pull request #9651 from davidflanagan/dominickuo-bug-867448
Merge pull request #9271 from samjoch/bug-859284-VideoPlayerAfterCompletionOfVideoPlaying

Bug 859284 - [Video Player] after completion of video playing in landsca... r=djf(cherry picked from commit 9947ab827649f9dc7b0a4c4e796fefb5c02d64dd)
Merge pull request #9659 from davidflanagan/bug859284-v1-train

Merge pull request #9271 from samjoch/bug-859284-VideoPlayerAfterComplet...
Revert "Merge pull request #9073 from mcirlanaru/bug_828237"

This reverts commit 1ad04796ce64a79c084a6fef1617fd49e43c3bff.
Merge pull request #9667 from davidflanagan/backout-keyboard-patch-v1-train

Revert "Merge pull request #9073 from mcirlanaru/bug_828237"
Merge pull request #9009 from dominickuo/music-allsongs-view

Bug 831265 - [music] implement all songs view, r=djf(cherry picked from commit f0ab15ca1a583080693b27be0d369d12e7dbd133)
Merge pull request #9082 from dominickuo/music-song-picker

Bug 849766 - [music] implement song picker, r=djf(cherry picked from commit 4617db5dcc927c2fe0e05769db42bab18b59efb5)