Merge "Controls UI - Direct 'add controls' to the proper activity" into rvc-dev