Merge "Fix metric uid for screenshare protection" into main