Merge "Device Default theming updates for Wear" into oc-mr1-dev