Merge "Update Switch track in SwitchPreference on watch" into cw-f-dev