Merge "Fix Switch in SwitchPreference on watch" into nyc-mr1-dev