better behavior on sync frequency settings
(cherry picked from commit 14b6773)