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

Change-Id: I4e192cd13aa43f59e75d8d29011cd1a5cb92b753