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

Change-Id: I899c242d2826ace45bff53e1ffd289cc1f13c605