Merge "Screenshot Policy updates" into main