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

Change-Id: I6eb862d98fb45a07ce07894e4afd5e0b33befa5d