Merge "Refresh TCM settings when they change" into pi-dev