Fix bug on window resize.
Merge remote-tracking branch 'upstream/oitDemo' into oitDemo
Update build.