Merge "Made moar ContentCapture APIs available for testing."