Merge "Add tint attribute to the icon" into pi-dev
am: 98496a5683

Change-Id: Ic69e73f1847637cf7913e03696e6823840bbcb38