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

Change-Id: Idf19bd5ce16c7e7682ce303ace537c5820ba1067