Merge "Remove manual pregrants for ContentCaptureService (now handled via roles)" into tm-dev