Merge "Stop P2P test cases in onStop() instead of onPause()"