Merge "Disable transparent policy for freeform activities" into main