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