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: d456b065 am: 19862c6a
Change-Id: Id249cbbeabfbf120f60c336fdddc3c96520bf05f