Merge "Unregister lux sensor when not in adaptive mode." into pi-dev