am e0612ffe: am 826debf5: Merge "Print UI bug fixing and printer discovery refactoring." into klp-dev

* commit 'e0612ffe5495602134d60422f63bfc05387512e1':
  Print UI bug fixing and printer discovery refactoring.