Merge "Update the "add print service" dialog as per UX spec." into klp-dev