Merge "Unregister the listener in onStop() instead of onDestroy()"