Merge "Controls UI - Only show controls after device is setup" into rvc-dev...
Merge "Controls UI - Only show controls after device is setup" into rvc-dev am: fb3ee920 am: 89cd6b43 am: 9273557e am: fe140911
Change-Id: I2ba590c2368a1592f6752ca7a79deef6558a6903