Merge "Controls UI - Fix dropdown layer list" into rvc-dev am: c8280712 am: 7b436ae6 am: a94d760c Change-Id: Iffaa44b8986929daf989b7d7faf6446dd9fe42fb