Merge "Ensure icon contrast on the shelf" into oc-dev am: d0550a9b6c
am: 206f1ef043

Change-Id: I3ee03acf859868b9225f1e90d537013875dc7e18