Merge "Enable useSessionIdToScheduleMdnsTask"