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

Change-Id: I09f5a5351f9c71be3db9d85405a4244cf0e3ee5d