Merge "Controls UI - GAR adjustments" into rvc-dev am: 97a8c8a1 am: 82cdea52 am: d0009bdf am: 5ffffaf1 am: 4ef820c5 Change-Id: Id47ef0334952b2f1ad6be824cacd9a8e71b95089