Merge "Fix possible NPE in TransparentPolicy" into main