am 1e1d5324: Merge "Print service settings polish" into klp-dev

* commit '1e1d532491ecf10e7fd5791559b5d97be5553ae4':
  Print service settings polish