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: 76df0829 am: e66d337f am: 81994adc
Change-Id: Ib77f66ffc6c2cadcc0484269e3008cee32d4f1db