Merge "SF: Use content detection flag to protect the content detection policy" into rvc-dev