Merge "Indicate configuration change when domain name changes" into tm-mainline-prod