Merge "Update Settings redlines per UX request" into lmp-preview-dev