Merge "Controls UI - Do not save empty structures" into rvc-dev am: 55bd691d2b am: 99532ba1d9

Change-Id: I0cf2c23a4a9a0ca5ce05f7b4b67ec5ed9d73f5ed