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