Fix crash on android
Fix Android first click
Merge commit '11a0f612b21cb7b2124427b26c08c12a507d3955'