Merge "Keep the native mdns daemon alive for pre-S application"