Merge "Controls UI - Remove focused control" into rvc-dev am: bf8d4b4480

Change-Id: Ia6d901dd9ee868941117007a63d2cec96a5f8882