[PRQ#40134] Merge Request for light-locker-settings-fix