Modify UX/UI for FEATURE_WATCH devices

Bug: 33784471
Test: Compile, Manual with TestApp
Change-Id: Ie0715442d8340e06f8a32e89be7857694552f3ed
2 files changed