Merge "Data activity didn't reflect UDP traffic" into pi-dev