Merge "Add some themes to let Settings use DeviceDefault." into nyc-mr1-dev