Merge "Fix null pointer exceptions in NetworkPolicyEditor"