Merge "Fix touch-to-wake while dozing" into mnc-dr-dev