Merge "Parental controls icon fixes."