Merge "Modify UX/UI for FEATURE_WATCH devices"