Merge "Restart USB stack only if data is unlocked"