Merge "Updated margins and spacing of preferences for watch type devices." into nyc-mr1-dev