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

Change-Id: I64f1411b27ef82d710c1a76b2ee42a520d4b79f7