Merge "Allow Advertiser, DiscoveryManager runtime toggle"