Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev