Merge "Refresh TCM settings when they change" into pi-dev
am: 3fa564030f

Change-Id: Ia8c3f5844dc908f2fb7671182bcc683850cf69d0