Merge "Refactor idle/low-light state management."