Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev