Merge "Fix 3303606: invalidate WaveView after resetting state" into honeycomb