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