Revert "Fix layout of MultiWaveView and GlowPadView."

This reverts commit d845d0c8c41f67b71833b8f413849b8c232bd926.