Merge "Badge the icon properly in policy transparency dialog" into pi-dev