Merge "Controls UI - Redline adjustment for structure switching + overflow" into rvc-dev am: 528e5209 am: 0480875f Change-Id: I22e4c6f134a832a2558d14d3a1aecfab2920f505