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