Merge "Remove all dividers in privacy page" into sc-dev