Merge "Support manual-add of IPPS and other printers"