Merge pull request #14957 from crh0716/909266

Bug 909266 - Add settings helper for roaming perference r=alive, jaoo(cherry picked from commit 3b603d6adb6b92df347f953e22e4c5f35927c97d)

Conflicts:
	apps/settings/index.html