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

Change-Id: I956e7d7a1c3dd13f20eb82501b2c4422dc585158