Merge "msm: event_timer: Fix potential race condition"