Merge "Fix timer problem of reset date&time"