Merge "SF: Disable OneShotTimerTest#noCallbacksAfterStopAndResetTest" into udc-dev