Merge "TimeDetectorStrategyImpl tidy ups / de-duping logic"