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

Change-Id: I2238655e40b4198cddd03122f1b76014ea705863