Merge "Repair lights out mode." into jb-mr1-dev