Merge "Multiple printer discovery session instances and other bugs." into klp-dev