Merge "Dead code: the original screenshot policy code" into main