Merge "Unregister lux sensor when not in adaptive mode." into pi-dev
am: 96fd5d9ed2

Change-Id: Ie9cb13caa26aac1d204e2228997a3afc6460b7cb