Merge "Controls UI - Do not update while drag in progress" into rvc-dev