Merge "Fix WakeLock issue for driver stop"