Merge "Change the NetworkType UI at UI thread." into tm-dev