Merge "Support for NFCC reports different protocol with same discovery ID"