Merge "Refactored ContentCapture sessions to use an int id."