Match SW spotlight with hardware

No functional change