Merge "Refactor functions into EmergencyNumberTracker"