Merge "Add test coverage to NoTypePolicyInstanceDialog"