Merge "Wipe data channel state when signal returns" into nyc-mr1-dev