Merge "Controls UI - Fix dropdown layer list" into rvc-dev am: c828071246

Change-Id: If85c47501302e51d824c5228ecdb6997220e81c7