Merge pull request #9138 from RudyLu/settings/keep_user-selected_timezone

Bug 847342 - keep the timezone user selected manually, r=@evelynhung, a=tef+(cherry picked from commit 40d6e1385b8abc1e80a6d5723c7be0132da16c0f)