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