Merge "Fixed the icon clipping of the notification shelf" into oc-mr1-dev