Merge "Add missing attrs to Theme.DeviceDefault" into sc-dev