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

Change-Id: I95908f4b7858dc13a7d041296fa4abea7837dd1a