Merge "Add Settings theme" into lmp-preview-dev