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

Change-Id: I286f4e0881d225a859f465e37a60944fb4427828