Merge "Improving customization in DeviceDefault themes." into cw-f-dev