Improve daylightingDeviceShelf logic

[#63421162]