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