Merge "Change display state modification during dozing"