Merge "TIF: fix parental control data inconsistency" into lmp-dev