Fix android build, and slowness while typing number.