Merge "Fixed a flickering of the icon when it goes into the shelf" into pi-dev
am: 40e41a6299

Change-Id: I37585d06d53e6213f163a38592605c855b551539