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