am 1c3203e8: Merge "Update Settings redlines per UX request" into lmp-preview-dev

* commit '1c3203e83efed2d5c257da8e4f5fba4844b6fa47':
  Update Settings redlines per UX request