Bad merge, not supposed to have onstop and onpause, just the latter