Merge "Controls UI - Fix action on unlock" into rvc-dev