Merge "Switch settings to use TimeDetector"