Merge "Fix the icon overlay after density change" into pi-dev