Timer: race condition fixes

Merged Darryl Green requested to merge github/fork/Elieva/ep/timer_fix into master

Created by: Elieva

Merge request reports