Merge "Optimizing OneShotTimer::reset() function"