Merge "Translating the icon in the shelf with the notification" into pi-dev