Merge "Consider userId in transparent policy heuristic" into main