Merge "Remove Advanced Privacy Settings screen"