Merge \\"Updated margins and spacing of preferences for watch type devices.\\" into nyc-mr1-dev am: 3a45f27ceb
am: 48ff322bb5

Change-Id: I2c5e445df1180535373ceb15eacb089300611a28