[Clare] Fix some problem on Android