Merge "Tweak wakeup time for OneShotTimer to reduce jank" into tm-dev