Add more zone locks around code that touches zone timer setting
in failure modes.
(cherry picked from commit 143d1c9767)
Add more zone locks around code that touches zone timer setting
in failure modes.
(cherry picked from commit 143d1c9767)