Merge "Add missing Settings constants." into tm-dev