Merge "event_timer: Add spinlock protection to event time update"