am 59b82c3e: (-s ours) am 42db3761: Merge "DO NOT MERGE Change display state...
am 59b82c3e: (-s ours) am 42db3761: Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev
* commit '59b82c3e':
DO NOT MERGE Change display state modification during dozing