Fix android close

Armin Felder requested to merge fixAndroidClose into master

Merge request reports