Some Window fixes...
Merge branch 'android' of https://github.com/gruby20/Sirvi into android