Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev