Merge "Add top level privacy hub preference" into sc-dev