Merge "Show new colored icon for PDF printer" into oc-dev
am: f160c57eb1

Change-Id: I98fb3d00cc9d6b92bced36c7f51834136ecca9c3