Merge "Controls UI - Redline adjustment for structure switching + overflow" into rvc-dev am: 528e5209ab am: ca3947b82c

Change-Id: I22cc678fa182b2dbb30873576fb19cab1b24bd7d