Merge "Show check icon on current locale preference" into tm-dev