Merge "Modify UX/UI for FEATURE_WATCH devices"
am: 9c519f801c

Change-Id: I4cd949934f9d56f36305d7a0afd1f49eca0548ca