Add the standard work-arounds for Android not cleaning up