pick a reasonable looking place for a SolarMutexGuard for setting changes

Change-Id: Ibfe88035900fb6aa638d9654b68a8b8b452c6c75