Merge "Crash if lock isn't held when it should be. This will help track down any errors." into rvc-dev