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

Change-Id: I467c31069e95528cf8925b30a601c7db3332d21d