Merge "Lights out improvements." into jb-dev