Merge "Refactor DeviceDefault themes." into nyc-mr1-dev