Update AirParrot to v2

Replaces #7580