Merge "Controls Ui - Redline adjustments" into rvc-dev am: fff9a30417 am: f6fe565105 am: 5995582681 am: 2e12fcc4bf

Change-Id: I5a9a9df841cf658c65f920ce23c19f199cc295b9