Android fixes to be asynchronous and more thread safe