Merge "Restore user-accessible lights-out control."