Merge "Remove the extra CONTENT_CAPTURE_STOP event from Activity.onStop()"