Merge "Print UI bug fixing and printer discovery refactoring." into klp-dev