Moved service stopping to onStop