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

Change-Id: Ie0a2486bdaeffff9f0308489966b0c74c84725e5