Fix flicker
Small fixes for android build (WIP)
Dont owerflow mesh make queue
Merge remote-tracking branch 'upstream/master' into next