Fix android close

Merged armin requested to merge fixAndroidClose into master

Merge request reports