Android: Several bug fixes in WaveFormControl. WaveFormView now uses generic WaveFormControl. There are still a few bugs but it's working almost as well as the previous implementation.