[Android] Tried to fix a bug but failed. Other improvements.