Merge "Fixed the icon clipping of the notification shelf" into oc-mr1-dev
am: 7e03612659

Change-Id: I623aa0c9a9b77f271e1666d5020b4ab3637cecf8