Updates in Android module and in the way the server handles control acks