Merge "Handle multiple phoneIds in time detection"