am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1

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