Merge "Fix icon tint on notification shelf" into oc-dev
am: 285ad4ce66

Change-Id: Ifbc2c1829182aa47de9e835a3bbeac7146a31d1b