Merge "Update Switch track in SwitchPreference on watch" into cw-f-dev am: 604e1f2595
am: 85933667f2

Change-Id: I084d7cb4d856daa2a532795886617326b2942221