Merge "Controls UI - Lock screen support" into rvc-dev