* commit 'a6a0d134ebfb0931473c5e54f21ff543e08b4a91': Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
* commit 'a6a0d134ebfb0931473c5e54f21ff543e08b4a91': Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.