Merge "Add support for DeviceEntryIcon: Occluded transitions" into main