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