Make control buttons work on Android
Merge branch 'CONTROL_BUTTONS'