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

Change-Id: If40eced3b54b8ea96fe11aa0c6bf58aa7124bf67