Merge "Add suspendable option in NanDiscoveryCommonConfig"