Fix crash regression in mesh file loading
Merge commit '5548423'
Fix timer reset occuring in-between frame's work