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

Change-Id: I193d6453719a02cf2fb62743a90518178fee5778