am f773a11d: Merge "Keep lights out even if the system changes it." into gb-ub-photos-denali

* commit 'f773a11d50fc48f3831f259075a0e64460f9baaa':
  Keep lights out even if the system changes it.