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

Change-Id: Ic82b4d1316d5232712a0e395b080262c314ecf68