Merge "Controls UI - Fix dropdown layer list" into rvc-dev am: c8280712 am: c5e5abb3 am: fbed8dc6 Change-Id: Id7fc4a1b27d4ec316a37a3696c32797d7ef05e49