Merge "Controls UI - Do not clear callbacks on user change" into rvc-dev