Merge "Controls UI - Fix crash on missing control" into rvc-dev am: 2c5cc48d am: 59169701 am: 715d1d6e am: 554ac3fe Change-Id: I6e1509f9f1bb745058ece114a9e476c81394b315