Merge "Doze: Fix WakeLock bug"