Merge "Fix 6398209: Improve MultiWaveView animations and interaction" into jb-dev