Merge "Fix wakelock leak for dozing" into mnc-dr-dev