Merge "SF: Renaming IdleTimer to OneShotTimer"