Merge "Added moar ContentCapture APIs (and their initial implementation)."