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