Merge "Fix issue where KidsModeTaskOrganizer registers itself as CompatUICallback" into tm-dev