Merge "Translating the icon in the shelf with the notification" into pi-dev am: 5b154cee04
am: ca7b762932

Change-Id: I3edb0f599d66d9ad280fd55c4d75d2daaefb5be7