Merge branch 'bug_531_fixed_not_visible_parental_control_padlock'