Merge "Printer Discovery: Refactor ServicePrint and NetworkDiscovery." into nyc-dev