Merge "[ToA] Terms of Address UI, string and locale list" into main