Merge "AOD: Increase shelf icon size while dark" into oc-dev