Merge "Fix ConcurrentModificationException of getEmergencyNumberList"