Merge "Also go to sleep when dozing" into oc-dr1-dev