Merge "Add buttonless UI for watch type devices." into cw-f-dev
am: 329610bd69

Change-Id: I75a3c8636b359d9948a9fae7229f21e1f1c658f8