Merge "Destroy activity in onStop()" into udc-dev