Merge "Update settings per latest UX spec." into jb-ub-mail-ur9