Merge "Controls UI - Direct 'add controls' to the proper activity" into rvc-dev am: 4552718e95 am: 6af09306ff am: c0468dc7d3 am: 56ee0bba3b
Change-Id: I986ce95a0fe7c0cacb51b406b45599d0d5504721
This commit is contained in: