Merge "Notify caller when unlockUser() bails out"