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