Merge "Clean up unnecessary lock of WmTests" into rvc-dev