Merge "Add missing settings strings." into tm-dev