Merge Android code after bug fixing