Merge "Don't trust DozeState onScreenState changes" into rvc-qpr-dev