Merge "Controls - Use new privacy setting" into sc-dev