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

Change-Id: I538c1a9bd7be4c04fbb44d45990850b5a18f3f57