Merge "Remove the ability to turn off TimeDetectorService"