Merge "Controls UI - GAR adjustments" into rvc-dev am: 97a8c8a1 am: 82cdea52 am: 6ff6e9e0 am: 6862cc5e Change-Id: I7d647530d5ba009145f474b114a87eba62df264a