Merge "Use png for switch in SwitchPreference on watch" into cw-f-dev