Merge "ATSParser: handle PID change"