Merge "Update Security & Privacy top-level settings icon." into udc-dev