Merge "Revert "log stack trace when finish() or onDestroy() is called""