Merge "Added trace points for ContentCapture."