Merge "Improved ContentCaptureManagerSession state."