Adding back the onStop lifecycle override