Merge "Reduce gratuitous resets for OneShotTimer" into tm-dev