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

Change-Id: I03251bd7e07c300a44eb889273ad54b2225177c9