Merge "Rely on the dozeAmount changes for mIsDozing" into sc-dev