Merge pull request #12699 from timdream/timezone-bug813987

Bug 916068 - make sure tzselector still works w/o voice network, r=evelyn
Conflicts:
	shared/js/tz_select.js