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