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

Change-Id: Ib66c544b60b47d6f2b0043055582fe854b2430d8