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

Change-Id: I931d8479c6b407de04099f85ba90315f34ca4ffd