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

Change-Id: I2f7fd1d685c3a90a4a55c2f66c3ef412fd24c2ee