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 ffc6ac77647bdbe178fabdf77e6d166ac2526508, v1-train)