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