Avoid return to menu on Android for the time being