Merge "Only restart the sleep state if SysUI was dozing" into tm-qpr-dev