Worked around android app not closing issue